diff --git a/python/client-contract/src/dfo_client_contract/refs/ref-one-member.json b/python/client-contract/src/dfo_client_contract/refs/ref-one-member.json index acb0db4..4326472 100644 --- a/python/client-contract/src/dfo_client_contract/refs/ref-one-member.json +++ b/python/client-contract/src/dfo_client_contract/refs/ref-one-member.json @@ -8,12 +8,12 @@ "members": [ { "parts": [], - "sentence": "Net disbursements to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", "spec": { - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "definition": { "schema_version": 1, - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "identity": { "shape": { "kind": "statvar_schema", @@ -51,6 +51,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "destination": [ "country/KEN" @@ -65,9 +71,9 @@ } } }, - "content_version": "cv_574e68a18917407b0f5534cfc9ff001b", + "content_version": "cv_6405444d04fda3b7ee8eb651528ab410", "artifact": { - "digest": "sha256:7ef1038eb25d978077bb4f5b9c54e940052ccd2aedd3284e6fb9739f1deca1f4", + "digest": "sha256:bff41f3d3d6707d06d4de9224994ad02cff5bb4cf219c3d8e7b8c96244ca81f9", "rendering": { "format": "parquet", "bundle": false diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-candidate-specs-not-a-list.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-candidate-specs-not-a-list.json index 8145a87..f7c561d 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-candidate-specs-not-a-list.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-candidate-specs-not-a-list.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "84b4f28565574e8bb1cb14cf3d4571af" + "x-dfo-trace-id": "aaf2ee5a8f71442a87eca115146a33a8" }, "json": { "schema_version": 1, @@ -41,21 +41,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8", "warnings": [], "timing_ms": { - "total": 7245, + "total": 2179, "by_step": { "coverage": 0, - "extract": 938, - "exclusion_read": 884, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 152, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 13359, "jev_output_tokens": 2855 @@ -66,39 +66,33 @@ "parts": [ { "variable_text": "mortality", - "warnings": [ - { - "code": "membership_unverified", - "severity": "warn", - "message": "the full set of series behind this answer could not be confirmed, so it uses the series the search found; a dataset made from it may hold different series." - } - ], + "warnings": [], "timing_ms": { - "total": 6280, + "total": 2172, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 5, - "shape_probe": 284, - "shape_groups": 7, + "shape_arcs": 1, + "shape_probe": 90, + "shape_groups": 5, "shape_labels": 1, "shape_admission": 4, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 95, - "shape_rank": 23, - "shape": 437, + "shape_quantity": 88, + "shape_rank": 15, + "shape": 216, "phase_prune_and_rank": 0, - "bind": 145, - "phase_bind": 24, + "bind": 141, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 561, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 292, - "phase_materialise": 14, - "answer": 97, - "phase_outcome": 4550 + "materialise": 16, + "phase_materialise": 23, + "answer": 26, + "phase_outcome": 1712 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -385,8 +379,9 @@ "label": "data source" } ], - "member_count": 2, - "refine_supported": true, + "member_count": 133, + "member_digest": "c090b56d31a596a8be16dafb518382db666c6b100a80534c3cb81dbfe3111c5d", + "refine_supported": false, "data_commons": [ { "id": "base", @@ -461,6 +456,7 @@ "stat_vars": { "member_count": 2, "member_count_exact": false, + "served_count": 1, "data_date_range": { "start": "2013", "end": "2022" @@ -802,7 +798,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -985,7 +981,7 @@ "label": "data source" } ], - "member_count": 2978, + "member_count": 2979, "refine_supported": true, "data_commons": [ { @@ -2355,7 +2351,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2591,7 +2587,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af" + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-candidates-choose-fetch.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-candidates-choose-fetch.json index 0f4f576..6fd60f0 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-candidates-choose-fetch.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-candidates-choose-fetch.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:56:54Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:28Z" }, "call": [ { @@ -38,7 +38,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "84b4f28565574e8bb1cb14cf3d4571af" + "x-dfo-trace-id": "aaf2ee5a8f71442a87eca115146a33a8" }, "json": { "schema_version": 1, @@ -49,21 +49,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8", "warnings": [], "timing_ms": { - "total": 7245, + "total": 2179, "by_step": { "coverage": 0, - "extract": 938, - "exclusion_read": 884, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 152, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 13359, "jev_output_tokens": 2855 @@ -74,39 +74,33 @@ "parts": [ { "variable_text": "mortality", - "warnings": [ - { - "code": "membership_unverified", - "severity": "warn", - "message": "the full set of series behind this answer could not be confirmed, so it uses the series the search found; a dataset made from it may hold different series." - } - ], + "warnings": [], "timing_ms": { - "total": 6280, + "total": 2172, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 5, - "shape_probe": 284, - "shape_groups": 7, + "shape_arcs": 1, + "shape_probe": 90, + "shape_groups": 5, "shape_labels": 1, "shape_admission": 4, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 95, - "shape_rank": 23, - "shape": 437, + "shape_quantity": 88, + "shape_rank": 15, + "shape": 216, "phase_prune_and_rank": 0, - "bind": 145, - "phase_bind": 24, + "bind": 141, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 561, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 292, - "phase_materialise": 14, - "answer": 97, - "phase_outcome": 4550 + "materialise": 16, + "phase_materialise": 23, + "answer": 26, + "phase_outcome": 1712 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -393,8 +387,9 @@ "label": "data source" } ], - "member_count": 2, - "refine_supported": true, + "member_count": 133, + "member_digest": "c090b56d31a596a8be16dafb518382db666c6b100a80534c3cb81dbfe3111c5d", + "refine_supported": false, "data_commons": [ { "id": "base", @@ -469,6 +464,7 @@ "stat_vars": { "member_count": 2, "member_count_exact": false, + "served_count": 1, "data_date_range": { "start": "2013", "end": "2022" @@ -810,7 +806,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -993,7 +989,7 @@ "label": "data source" } ], - "member_count": 2978, + "member_count": 2979, "refine_supported": true, "data_commons": [ { @@ -2363,7 +2359,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2645,7 +2641,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "9ceb8ef9c2e348a3b4acd719cc158577" + "x-dfo-trace-id": "ebef0ee209ee4987b258543a6e166566" }, "json": { "schema_version": 1, @@ -2654,11 +2650,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "9ceb8ef9c2e348a3b4acd719cc158577", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "ebef0ee209ee4987b258543a6e166566", "warnings": [], "timing_ms": { - "total": 587, + "total": 458, "by_step": { "coverage": 0 } @@ -2671,32 +2667,32 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 516, + "total": 409, "by_step": { "validate": 0, "phase_validate": 0, - "walk": 178, + "walk": 0, "reread_arcs": 0, "phase_reread_arcs": 0, - "detect_edits": 1, + "detect_edits": 0, "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 251, + "shape": 300, "phase_build_shape": 0, "bind": 0, "phase_build_bindings": 0, - "where_places": 0, + "where_places": 1, "phase_where_places": 0, - "materialise": 79, + "materialise": 103, "phase_materialise": 0, - "ground_related": 1, + "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, "answer": 2, "ground_gates": 0, - "phase_ground_build": 2, + "phase_ground_build": 1, "finalize_preview": 0, "options": 0, "finalize_related": 2, @@ -3212,7 +3208,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -3454,7 +3450,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "87e3dacd472e40be99f590403ae1bd9e" + "x-dfo-trace-id": "dfb8a8166ef345b99a71548d82dba125" }, "json": { "schema_version": 1, @@ -3665,7 +3661,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261023T061534Z-06fa7b89", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:03.390780+00:00" + "confirmed_at": "2026-11-15T21:45:20.198434+00:00" }, "warnings": [], "diagnostics": [ @@ -3865,7 +3861,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A38f1b5db24567c68f9791ac00bce803082c607f23c78688edf2d95e0778a070a?X-Goog-Signature=redacted", - "x-dfo-trace-id": "ac7de8dd54624663a2e8bf84cfec62be" + "x-dfo-trace-id": "54c7e7ac1c4e4eadab5669589546475d" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-catalogue.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-catalogue.json index 764ff05..e426945 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-catalogue.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-catalogue.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:20Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:46Z" }, "call": [ { @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "908b011bca7c43609e2eb76c1a5777b5" + "x-dfo-trace-id": "f6befe5fc2b141548623eafce602bb0a" }, "json": { "schema_version": 1, @@ -42,26 +42,23 @@ "entry_path": "raw_text", "raw_query": "what data do you have?", "normalized_query": "what data do you have?", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "908b011bca7c43609e2eb76c1a5777b5", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "f6befe5fc2b141548623eafce602bb0a", "warnings": [], "timing_ms": { - "total": 787, + "total": 1, "by_step": { "coverage": 0, - "extract": 785, - "exclusion_read": 578, - "entity_check": 0, - "cache_lookup": 0 + "response_cache_layer1": 1 } }, "llm_usage": { - "input_tokens": 2749, - "output_tokens": 36, - "cached_tokens": 976 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -85,7 +82,7 @@ "error": { "class": "DeclinedError", "code": "answer_declined", - "trace_id": "908b011bca7c43609e2eb76c1a5777b5" + "trace_id": "f6befe5fc2b141548623eafce602bb0a" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-declined.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-declined.json index 0ee1e30..29d508e 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-declined.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-declined.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:18Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:46Z" }, "call": [ { @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "62cc8abb6ea04a19ac2142d7dacc768d" + "x-dfo-trace-id": "cced6d18d3f14496be37a2760cfbc7b8" }, "json": { "schema_version": 1, @@ -42,25 +42,22 @@ "entry_path": "raw_text", "raw_query": "should donors give more aid to Kenya?", "normalized_query": "should donors give more aid to Kenya?", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "62cc8abb6ea04a19ac2142d7dacc768d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "cced6d18d3f14496be37a2760cfbc7b8", "warnings": [], "timing_ms": { - "total": 903, + "total": 1, "by_step": { "coverage": 0, - "extract": 900, - "exclusion_read": 571, - "entity_check": 0, - "cache_lookup": 0 + "response_cache_layer1": 1 } }, "llm_usage": { - "input_tokens": 2753, - "output_tokens": 73, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0 }, "timed_out": false @@ -91,7 +88,7 @@ "error": { "class": "DeclinedError", "code": "answer_declined", - "trace_id": "62cc8abb6ea04a19ac2142d7dacc768d" + "trace_id": "cced6d18d3f14496be37a2760cfbc7b8" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-definite-fetch.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-definite-fetch.json index e5a793a..2bc4f01 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-definite-fetch.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-definite-fetch.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:56:49Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:25Z" }, "call": [ { @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -45,22 +45,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -72,33 +72,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1205,7 +1205,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3357,7 +3357,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -3957,7 +3957,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -4361,7 +4361,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -4721,7 +4721,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "7385994748ff4d0f893c114a8272a43d" + "x-dfo-trace-id": "6ad230a24c054c348d20b568c8e92341" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-definition-spec-id-mismatch.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-definition-spec-id-mismatch.json index bc77ba7..5f0f3e8 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-definition-spec-id-mismatch.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-definition-spec-id-mismatch.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -41,22 +41,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -68,33 +68,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1201,7 +1201,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3353,7 +3353,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -3871,7 +3871,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "8bed5df00b974595ad418493ea0ade6d" + "trace_id": "d6b233624975426297250674cb0ddda2" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-empty-parts.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-empty-parts.json index d0d60f5..997c692 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-empty-parts.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-empty-parts.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -41,22 +41,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -102,7 +102,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f" + "trace_id": "264af30e460747b4859f987898038f4c" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-folded-parts-unnamed.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-folded-parts-unnamed.json index 3048bc9..a99e498 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-folded-parts-unnamed.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-folded-parts-unnamed.json @@ -33,7 +33,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "b371e251aceb4b8bb0ec11326539902e" + "x-dfo-trace-id": "32a6877df5574b0297dede72b16cf212" }, "json": { "schema_version": 1, @@ -41,27 +41,23 @@ "entry_path": "raw_text", "raw_query": "ODA disbursements for health and for education from Germany to Kenya, and GDP of Kenya", "normalized_query": "ODA disbursements for health and for education from Germany to Kenya, and GDP of Kenya", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "b371e251aceb4b8bb0ec11326539902e", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "32a6877df5574b0297dede72b16cf212", "warnings": [], "timing_ms": { - "total": 6200, + "total": 7, "by_step": { "coverage": 0, - "extract": 1113, - "exclusion_read": 524, - "cache_lookup": 1 + "response_cache_layer1": 1 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 193, - "cached_tokens": 978, - "jev_input_tokens": 26122, - "jev_output_tokens": 6124 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -70,33 +66,33 @@ { "warnings": [], "timing_ms": { - "total": 4795, + "total": 4556, "by_step": { - "recall": 677, - "phase_resolve_places": 1, + "recall": 854, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 4, - "shape_probe": 125, - "shape_groups": 857, - "shape_labels": 23, - "shape_admission": 2, + "shape_arcs": 1, + "shape_probe_coverage": 5, + "shape_probe": 189, + "shape_groups": 103, + "shape_labels": 39, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 0, - "shape_quantity": 67, + "shape_denominators": 3, + "shape_quantity": 120, "shape_rank": 0, - "shape": 1123, + "shape": 494, "phase_prune_and_rank": 0, - "bind": 605, - "phase_bind": 123, - "phase_settle": 136, - "phase_place_bindings": 99, + "bind": 463, + "phase_bind": 94, + "phase_settle": 678, + "phase_place_bindings": 23, "phase_facet_requests": 0, - "materialise": 1228, - "phase_materialise": 244, - "answer": 199, - "options": 224, - "phase_outcome": 136 + "materialise": 1045, + "phase_materialise": 191, + "answer": 420, + "options": 173, + "phase_outcome": 121 } }, "restatement": { @@ -628,12 +624,6 @@ ] }, "facets": { - "unit": { - "basis": "fallback", - "ref": "CurrencyUSD", - "label": "US Dollar", - "currency": "USD" - }, "provenance": { "basis": "fallback", "ref": "provenance/OECDCreditorReportingSystem", @@ -648,6 +638,12 @@ }, "documentation": "/api/graph/documentation/provenance/OECDCreditorReportingSystem", "account": "provider" + }, + "unit": { + "basis": "fallback", + "ref": "CurrencyUSD", + "label": "US Dollar", + "currency": "USD" } }, "slot_options": [ @@ -1920,7 +1916,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4098,7 +4094,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [ { @@ -4409,33 +4405,33 @@ } ], "timing_ms": { - "total": 4371, + "total": 3605, "by_step": { - "recall": 625, + "recall": 531, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 5, - "shape_probe": 144, - "shape_groups": 868, - "shape_labels": 14, - "shape_admission": 35, + "shape_arcs": 1, + "shape_probe_coverage": 3, + "shape_probe": 136, + "shape_groups": 80, + "shape_labels": 10, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 281, + "shape_quantity": 107, "shape_rank": 0, - "shape": 1394, + "shape": 367, "phase_prune_and_rank": 0, - "bind": 219, - "phase_bind": 141, - "phase_settle": 140, - "phase_place_bindings": 175, + "bind": 611, + "phase_bind": 132, + "phase_settle": 105, + "phase_place_bindings": 45, "phase_facet_requests": 0, - "materialise": 773, - "phase_materialise": 240, - "answer": 32, - "options": 171, - "phase_outcome": 461 + "materialise": 1208, + "phase_materialise": 208, + "answer": 56, + "options": 194, + "phase_outcome": 148 } }, "restatement": { @@ -4967,12 +4963,6 @@ ] }, "facets": { - "unit": { - "basis": "fallback", - "ref": "CurrencyUSD", - "label": "US Dollar", - "currency": "USD" - }, "provenance": { "basis": "fallback", "ref": "provenance/OECDCreditorReportingSystem", @@ -4987,6 +4977,12 @@ }, "documentation": "/api/graph/documentation/provenance/OECDCreditorReportingSystem", "account": "provider" + }, + "unit": { + "basis": "fallback", + "ref": "CurrencyUSD", + "label": "US Dollar", + "currency": "USD" } }, "slot_options": [ @@ -6259,7 +6255,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -8437,7 +8433,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [ { @@ -8748,33 +8744,33 @@ } ], "timing_ms": { - "total": 3123, + "total": 4949, "by_step": { - "recall": 220, + "recall": 1200, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 9, + "shape_arcs": 5, "shape_probe_coverage": 1, - "shape_probe": 68, + "shape_probe": 290, "shape_groups": 134, - "shape_labels": 12, - "shape_admission": 2, + "shape_labels": 10, + "shape_admission": 69, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, - "shape_rank": 7, - "shape": 362, + "shape_denominators": 6, + "shape_quantity": 782, + "shape_rank": 35, + "shape": 1483, "phase_prune_and_rank": 0, - "bind": 138, - "phase_bind": 19, - "phase_settle": 17, - "phase_place_bindings": 989, + "bind": 181, + "phase_bind": 21, + "phase_settle": 15, + "phase_place_bindings": 349, "phase_facet_requests": 0, - "materialise": 205, - "phase_materialise": 20, - "answer": 185, - "options": 93, - "phase_outcome": 875 + "materialise": 181, + "phase_materialise": 61, + "answer": 112, + "options": 96, + "phase_outcome": 1250 } }, "restatement": { @@ -10145,7 +10141,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [ @@ -10654,7 +10650,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [ @@ -13199,7 +13195,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "7105f139fcac42d9a3ce73565eb2cda7" + "x-dfo-trace-id": "4b670903fee14a55a252f8c7aea677a4" }, "json": { "schema_version": 1, @@ -18525,7 +18521,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261029T171521Z-7d0a5854", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:15.691224+00:00" + "confirmed_at": "2026-11-15T21:45:34.502353+00:00" }, "warnings": [], "diagnostics": [ @@ -18880,7 +18876,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A228f4a6d447c0e6a811c951c10522dda47f68ae38efede7be384c4c7e7d6f2d2?X-Goog-Signature=redacted", - "x-dfo-trace-id": "d508d1a32d49465b8f2a320a8995aedd" + "x-dfo-trace-id": "3ce2816a9a96407faecc5550bfd00c01" } } }, @@ -18967,7 +18963,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "607faa7ec8564ef69d13756c934461c6" + "x-dfo-trace-id": "c8d1311a882544a3b70935eca11bb1a5" }, "json": { "schema_version": 1, @@ -19139,8 +19135,8 @@ "family_member_digest": "73519eeb75639bdae33042fc844830cd46becc08e4f9122dfcd0886e9875f657", "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261020T170016Z-691bf0da", - "served_from": "materialise", - "confirmed_at": "2026-11-14T13:57:18.160513+00:00" + "served_from": "head", + "confirmed_at": "2026-11-15T21:45:38.202471+00:00" }, "warnings": [], "diagnostics": [ @@ -19339,7 +19335,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A808854a365316cc5024b25f3585fee44f79a5699b49e7cf71c1513c8a12452cd?X-Goog-Signature=redacted", - "x-dfo-trace-id": "3ebb326077c74f8cb36ceb77064be340" + "x-dfo-trace-id": "dc9ffde0f74c416dbcfba94f6973f900" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-partial.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-partial.json index d11f7b1..cddbbca 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-partial.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-partial.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:06Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:33Z" }, "call": [ { @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "3b434a4eac2f49a690b76a3e3ae55141" + "x-dfo-trace-id": "19db6c16b2f444fb81ab187c0fa400f4" }, "json": { "schema_version": 1, @@ -46,11 +46,11 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "3b434a4eac2f49a690b76a3e3ae55141", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "19db6c16b2f444fb81ab187c0fa400f4", "warnings": [], "timing_ms": { - "total": 496, + "total": 376, "by_step": { "coverage": 0, "extract": 0, @@ -73,33 +73,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 484, + "total": 369, "by_step": { - "recall": 3, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 1, - "shape_probe_coverage": 17, - "shape_probe": 18, - "shape_groups": 8, - "shape_labels": 13, - "shape_admission": 5, + "shape_probe_coverage": 14, + "shape_probe": 14, + "shape_groups": 5, + "shape_labels": 10, + "shape_admission": 0, "phase_derive_shapes": 0, "shape_denominators": 0, "shape_quantity": 86, "shape_rank": 1, - "shape": 150, + "shape": 128, "phase_prune_and_rank": 0, - "bind": 150, - "phase_bind": 15, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 112, + "phase_bind": 12, + "phase_settle": 12, + "phase_place_bindings": 9, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 26, + "materialise": 8, + "phase_materialise": 21, "answer": 2, - "options": 9, - "phase_outcome": 81 + "options": 6, + "phase_outcome": 58 } }, "restatement": { @@ -1290,7 +1290,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3277,20 +3277,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 43, + "total": 14, "by_step": { "recall": 2, - "phase_resolve_places": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 0, - "shape_probe": 9, + "shape_probe": 5, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 23, + "shape_admission": 2, "phase_derive_shapes": 0, - "shape_denominators": 1, + "shape_denominators": 0, "shape_quantity": 0, - "shape": 40, + "shape": 12, "phase_prune_and_rank": 0 } }, @@ -3746,7 +3746,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "d86b4ecdceb749928ddb690c983dce89" + "x-dfo-trace-id": "346dda829e294e56962e0010c5c97524" }, "json": { "schema_version": 1, @@ -3989,7 +3989,7 @@ "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:07.625113+00:00" + "confirmed_at": "2026-11-15T21:45:26.227424+00:00" }, "warnings": [], "diagnostics": [ @@ -4230,7 +4230,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A750c79d2b819ea712f21ff401fec9e3f8815c6258bd4c7e9e0ad263a9517ff96?X-Goog-Signature=redacted", - "x-dfo-trace-id": "52eaf209bab14158bd96c2306e18a721" + "x-dfo-trace-id": "b526e956c0554776b7c7f1ff514b3459" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-raises.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-raises.json index 680e3d6..5e9b013 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-raises.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-mixed-fetch-raises.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:04Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:32Z" }, "call": [ { @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "f0113be980e4445fbe353f7e65bd74a4" + "x-dfo-trace-id": "8d84cb6071184b50890ef1d463fcb67d" }, "json": { "schema_version": 1, @@ -45,21 +45,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -72,33 +72,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1289,7 +1289,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3276,20 +3276,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, @@ -3675,7 +3675,7 @@ "error": { "class": "IncompleteAnswerError", "code": "answer_incomplete", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4" + "trace_id": "8d84cb6071184b50890ef1d463fcb67d" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-nested-specs-unchecked.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-nested-specs-unchecked.json index 0c510a4..4c6726c 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-nested-specs-unchecked.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-nested-specs-unchecked.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ff4acc343b1c4f6eb52d20c213ba7063" + "x-dfo-trace-id": "874eac3d4a174c319d424bdd2c3a41e2" }, "json": { "schema_version": 1, @@ -45,16 +45,16 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ff4acc343b1c4f6eb52d20c213ba7063", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "874eac3d4a174c319d424bdd2c3a41e2", "warnings": [], "timing_ms": { - "total": 10, + "total": 6, "by_step": { "coverage": 0, - "extract": 1, + "extract": 0, "exclusion_read": 0, - "cache_lookup": 1 + "cache_lookup": 0 } }, "llm_usage": { @@ -70,9 +70,9 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 2, + "total": 1, "by_step": { - "recall": 2, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -226,17 +226,17 @@ } ], "flagged_match": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "definition": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069" + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e" } }, "alternate_match": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "definition": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069" + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e" } } } @@ -311,7 +311,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "cd6446a0000d43bcbed6084d8b562df5" + "x-dfo-trace-id": "9250fd3536da4cdcb17897807dd24231" }, "json": { "schema_version": 1, @@ -320,21 +320,20 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "cd6446a0000d43bcbed6084d8b562df5", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "9250fd3536da4cdcb17897807dd24231", "warnings": [], "timing_ms": { - "total": 1077, + "total": 3, "by_step": { - "coverage": 0 + "coverage": 0, + "response_cache_layer2": 1 } }, "llm_usage": { "input_tokens": 0, "output_tokens": 0, - "cached_tokens": 0, - "jev_input_tokens": 7477, - "jev_output_tokens": 1674 + "cached_tokens": 0 }, "timed_out": false }, @@ -350,33 +349,33 @@ } ], "timing_ms": { - "total": 1070, + "total": 1880, "by_step": { - "recall": 1, + "recall": 0, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe_coverage": 9, - "shape_probe": 90, - "shape_groups": 121, + "shape_arcs": 0, + "shape_probe_coverage": 7, + "shape_probe": 999, + "shape_groups": 79, "shape_labels": 1, - "shape_admission": 1, + "shape_admission": 0, "phase_derive_shapes": 0, "shape_denominators": 0, "shape_quantity": 116, - "shape_rank": 114, - "shape": 484, + "shape_rank": 101, + "shape": 1325, "phase_prune_and_rank": 0, - "bind": 139, - "phase_bind": 132, + "bind": 143, + "phase_bind": 128, "phase_settle": 6, - "phase_place_bindings": 94, + "phase_place_bindings": 71, "phase_facet_requests": 0, - "materialise": 21, - "phase_materialise": 7, - "answer": 11, - "options": 35, - "phase_outcome": 140 + "materialise": 25, + "phase_materialise": 5, + "answer": 7, + "options": 49, + "phase_outcome": 121 } }, "restatement": { @@ -416,10 +415,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "definition": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -470,6 +469,12 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -682,6 +687,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2018", "end": "2018" @@ -711,20 +717,6 @@ "has_data": true, "observation_count": 1, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2018, "end_year": 2018 @@ -752,30 +744,12 @@ "financingProvider": 1, "financingRecipient": 1 } - }, - { - "year": 2017, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } - }, - { - "year": 2016, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } } ] }, "download": { "rows": 1, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2018, @@ -788,9 +762,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -799,7 +773,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -873,7 +846,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -904,7 +877,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -1200,7 +1173,7 @@ "start_year": 2018, "end_year": 2018 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -1209,7 +1182,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -3221,10 +3194,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "base": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -3275,15 +3248,21 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069:measure_basis", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -3350,18 +3329,19 @@ ] }, { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069:provider", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e:provider", "axis": "provider", - "rule": "bilateral_recipient_total", + "rule": "bilateral_destinations", "provenance": "default", "active": "provider:bilateral", "options": [ { "option_id": "provider:bilateral", - "label": "bilateral flows only", + "label": "bilateral flows to countries and regions, without core contributions to multilateral agencies", "binding": { "kind": "provider", - "scope": "bilateral" + "scope": "bilateral", + "provenance": "provenance/ONEDAC2aBilateral" }, "availability": { "status": "available", @@ -3380,12 +3360,27 @@ "status": "available", "detail": {} } + }, + { + "option_id": "provider:contributions", + "label": "total ODA, including core contributions to multilateral agencies", + "binding": { + "kind": "provider", + "scope": "contributions" + }, + "availability": { + "status": "unavailable", + "code": "provider_not_offered", + "detail": { + "why": "destination_bilateral" + } + } } ] } ], "compiled": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -3436,11 +3431,25 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2018, + 2018 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -3500,10 +3509,10 @@ }, "equivalent_readings": [ { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "definition": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069" + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e" } } ] @@ -3511,7 +3520,7 @@ } } ], - "rendered_sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -3545,7 +3554,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3729,10 +3738,10 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "complete": true, "specs": [ - "spec_8435999aa7036a9ab5ff61e26cc18069" + "spec_1f49edc1cb34ebb3ea772ca68f04a34e" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-operations-not-a-list.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-operations-not-a-list.json index 25b7078..5bc9456 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-operations-not-a-list.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-operations-not-a-list.json @@ -33,7 +33,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -44,22 +44,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -71,33 +71,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1208,7 +1208,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3360,7 +3360,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -3960,7 +3960,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -4364,7 +4364,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -4724,7 +4724,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "7385994748ff4d0f893c114a8272a43d" + "x-dfo-trace-id": "6ad230a24c054c348d20b568c8e92341" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-part-status-not-a-string.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-part-status-not-a-string.json index b8d581e..fec1496 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-part-status-not-a-string.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-part-status-not-a-string.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "f0113be980e4445fbe353f7e65bd74a4" + "x-dfo-trace-id": "8d84cb6071184b50890ef1d463fcb67d" }, "json": { "schema_version": 1, @@ -41,21 +41,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -68,33 +68,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1285,7 +1285,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3272,20 +3272,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, @@ -3653,7 +3653,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4" + "trace_id": "8d84cb6071184b50890ef1d463fcb67d" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-several-readings-folded.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-several-readings-folded.json index ead9e30..f005655 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-several-readings-folded.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-several-readings-folded.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:08Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:34Z" }, "call": [ { @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "b371e251aceb4b8bb0ec11326539902e" + "x-dfo-trace-id": "32a6877df5574b0297dede72b16cf212" }, "json": { "schema_version": 1, @@ -42,27 +42,23 @@ "entry_path": "raw_text", "raw_query": "ODA disbursements for health and for education from Germany to Kenya, and GDP of Kenya", "normalized_query": "ODA disbursements for health and for education from Germany to Kenya, and GDP of Kenya", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "b371e251aceb4b8bb0ec11326539902e", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "32a6877df5574b0297dede72b16cf212", "warnings": [], "timing_ms": { - "total": 6200, + "total": 7, "by_step": { "coverage": 0, - "extract": 1113, - "exclusion_read": 524, - "cache_lookup": 1 + "response_cache_layer1": 1 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 193, - "cached_tokens": 978, - "jev_input_tokens": 26122, - "jev_output_tokens": 6124 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -72,33 +68,33 @@ "variable_text": "ODA disbursements for health", "warnings": [], "timing_ms": { - "total": 4795, + "total": 4556, "by_step": { - "recall": 677, - "phase_resolve_places": 1, + "recall": 854, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 4, - "shape_probe": 125, - "shape_groups": 857, - "shape_labels": 23, - "shape_admission": 2, + "shape_arcs": 1, + "shape_probe_coverage": 5, + "shape_probe": 189, + "shape_groups": 103, + "shape_labels": 39, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 0, - "shape_quantity": 67, + "shape_denominators": 3, + "shape_quantity": 120, "shape_rank": 0, - "shape": 1123, + "shape": 494, "phase_prune_and_rank": 0, - "bind": 605, - "phase_bind": 123, - "phase_settle": 136, - "phase_place_bindings": 99, + "bind": 463, + "phase_bind": 94, + "phase_settle": 678, + "phase_place_bindings": 23, "phase_facet_requests": 0, - "materialise": 1228, - "phase_materialise": 244, - "answer": 199, - "options": 224, - "phase_outcome": 136 + "materialise": 1045, + "phase_materialise": 191, + "answer": 420, + "options": 173, + "phase_outcome": 121 } }, "restatement": { @@ -630,12 +626,6 @@ ] }, "facets": { - "unit": { - "basis": "fallback", - "ref": "CurrencyUSD", - "label": "US Dollar", - "currency": "USD" - }, "provenance": { "basis": "fallback", "ref": "provenance/OECDCreditorReportingSystem", @@ -650,6 +640,12 @@ }, "documentation": "/api/graph/documentation/provenance/OECDCreditorReportingSystem", "account": "provider" + }, + "unit": { + "basis": "fallback", + "ref": "CurrencyUSD", + "label": "US Dollar", + "currency": "USD" } }, "slot_options": [ @@ -1922,7 +1918,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4100,7 +4096,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [ { @@ -4411,33 +4407,33 @@ } ], "timing_ms": { - "total": 4371, + "total": 3605, "by_step": { - "recall": 625, + "recall": 531, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 5, - "shape_probe": 144, - "shape_groups": 868, - "shape_labels": 14, - "shape_admission": 35, + "shape_arcs": 1, + "shape_probe_coverage": 3, + "shape_probe": 136, + "shape_groups": 80, + "shape_labels": 10, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 281, + "shape_quantity": 107, "shape_rank": 0, - "shape": 1394, + "shape": 367, "phase_prune_and_rank": 0, - "bind": 219, - "phase_bind": 141, - "phase_settle": 140, - "phase_place_bindings": 175, + "bind": 611, + "phase_bind": 132, + "phase_settle": 105, + "phase_place_bindings": 45, "phase_facet_requests": 0, - "materialise": 773, - "phase_materialise": 240, - "answer": 32, - "options": 171, - "phase_outcome": 461 + "materialise": 1208, + "phase_materialise": 208, + "answer": 56, + "options": 194, + "phase_outcome": 148 } }, "restatement": { @@ -4969,12 +4965,6 @@ ] }, "facets": { - "unit": { - "basis": "fallback", - "ref": "CurrencyUSD", - "label": "US Dollar", - "currency": "USD" - }, "provenance": { "basis": "fallback", "ref": "provenance/OECDCreditorReportingSystem", @@ -4989,6 +4979,12 @@ }, "documentation": "/api/graph/documentation/provenance/OECDCreditorReportingSystem", "account": "provider" + }, + "unit": { + "basis": "fallback", + "ref": "CurrencyUSD", + "label": "US Dollar", + "currency": "USD" } }, "slot_options": [ @@ -6261,7 +6257,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -8439,7 +8435,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [ { @@ -8750,33 +8746,33 @@ } ], "timing_ms": { - "total": 3123, + "total": 4949, "by_step": { - "recall": 220, + "recall": 1200, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 9, + "shape_arcs": 5, "shape_probe_coverage": 1, - "shape_probe": 68, + "shape_probe": 290, "shape_groups": 134, - "shape_labels": 12, - "shape_admission": 2, + "shape_labels": 10, + "shape_admission": 69, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, - "shape_rank": 7, - "shape": 362, + "shape_denominators": 6, + "shape_quantity": 782, + "shape_rank": 35, + "shape": 1483, "phase_prune_and_rank": 0, - "bind": 138, - "phase_bind": 19, - "phase_settle": 17, - "phase_place_bindings": 989, + "bind": 181, + "phase_bind": 21, + "phase_settle": 15, + "phase_place_bindings": 349, "phase_facet_requests": 0, - "materialise": 205, - "phase_materialise": 20, - "answer": 185, - "options": 93, - "phase_outcome": 875 + "materialise": 181, + "phase_materialise": 61, + "answer": 112, + "options": 96, + "phase_outcome": 1250 } }, "restatement": { @@ -10147,7 +10143,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [ @@ -10656,7 +10652,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [ @@ -13201,7 +13197,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "7105f139fcac42d9a3ce73565eb2cda7" + "x-dfo-trace-id": "4b670903fee14a55a252f8c7aea677a4" }, "json": { "schema_version": 1, @@ -18527,7 +18523,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261029T171521Z-7d0a5854", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:15.691224+00:00" + "confirmed_at": "2026-11-15T21:45:34.502353+00:00" }, "warnings": [], "diagnostics": [ @@ -18882,7 +18878,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A228f4a6d447c0e6a811c951c10522dda47f68ae38efede7be384c4c7e7d6f2d2?X-Goog-Signature=redacted", - "x-dfo-trace-id": "d508d1a32d49465b8f2a320a8995aedd" + "x-dfo-trace-id": "3ce2816a9a96407faecc5550bfd00c01" } } }, @@ -18969,7 +18965,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "607faa7ec8564ef69d13756c934461c6" + "x-dfo-trace-id": "c8d1311a882544a3b70935eca11bb1a5" }, "json": { "schema_version": 1, @@ -19141,8 +19137,8 @@ "family_member_digest": "73519eeb75639bdae33042fc844830cd46becc08e4f9122dfcd0886e9875f657", "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261020T170016Z-691bf0da", - "served_from": "materialise", - "confirmed_at": "2026-11-14T13:57:18.160513+00:00" + "served_from": "head", + "confirmed_at": "2026-11-15T21:45:38.202471+00:00" }, "warnings": [], "diagnostics": [ @@ -19341,7 +19337,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A808854a365316cc5024b25f3585fee44f79a5699b49e7cf71c1513c8a12452cd?X-Goog-Signature=redacted", - "x-dfo-trace-id": "3ebb326077c74f8cb36ceb77064be340" + "x-dfo-trace-id": "dc9ffde0f74c416dbcfba94f6973f900" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-identity.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-identity.json index 3d5acb8..9b90cc3 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-identity.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-identity.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -41,22 +41,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -68,33 +68,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1138,7 +1138,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3290,7 +3290,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -3808,7 +3808,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "8bed5df00b974595ad418493ea0ade6d" + "trace_id": "d6b233624975426297250674cb0ddda2" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-resolved.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-resolved.json index daab35f..d6e7ea2 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-resolved.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-spec-without-resolved.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -41,22 +41,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -68,33 +68,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -428,7 +428,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "8bed5df00b974595ad418493ea0ade6d" + "trace_id": "d6b233624975426297250674cb0ddda2" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out-keeps-reasons.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out-keeps-reasons.json index 118b59b..c3f837a 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out-keeps-reasons.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out-keeps-reasons.json @@ -44,21 +44,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -71,33 +71,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1288,7 +1288,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3275,20 +3275,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out.json index b9edeab..77eab28 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-timed-out.json @@ -44,21 +44,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -71,33 +71,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1288,7 +1288,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3275,20 +3275,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-enum-value.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-enum-value.json index 1c37e43..afe7a66 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-enum-value.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-enum-value.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -41,22 +41,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -66,11 +66,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-kind.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-kind.json index 7011a90..37cf2d5 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-kind.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-kind.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -41,22 +41,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -66,11 +66,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", @@ -264,7 +264,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f" + "trace_id": "264af30e460747b4859f987898038f4c" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-part-status.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-part-status.json index 035fb49..1ac7bc1 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-part-status.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-unknown-part-status.json @@ -33,7 +33,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "f0113be980e4445fbe353f7e65bd74a4" + "x-dfo-trace-id": "8d84cb6071184b50890ef1d463fcb67d" }, "json": { "schema_version": 1, @@ -44,21 +44,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -71,33 +71,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1288,7 +1288,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3275,20 +3275,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, @@ -3674,7 +3674,7 @@ "error": { "class": "IncompleteAnswerError", "code": "answer_incomplete", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4" + "trace_id": "8d84cb6071184b50890ef1d463fcb67d" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/answer-unsupported-part.json b/python/client-contract/src/dfo_client_contract/scenarios/answer-unsupported-part.json index a9d2817..1717795 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/answer-unsupported-part.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/answer-unsupported-part.json @@ -33,7 +33,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "f0113be980e4445fbe353f7e65bd74a4" + "x-dfo-trace-id": "8d84cb6071184b50890ef1d463fcb67d" }, "json": { "schema_version": 1, @@ -44,21 +44,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -71,33 +71,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1288,7 +1288,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3275,20 +3275,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, @@ -3668,7 +3668,7 @@ "error": { "class": "IncompleteAnswerError", "code": "answer_incomplete", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4" + "trace_id": "8d84cb6071184b50890ef1d463fcb67d" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-assumed-reading.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-assumed-reading.json index 17a00ab..87a337a 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-assumed-reading.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-assumed-reading.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "84b4f28565574e8bb1cb14cf3d4571af" + "x-dfo-trace-id": "aaf2ee5a8f71442a87eca115146a33a8" }, "json": { "schema_version": 1, @@ -45,21 +45,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8", "warnings": [], "timing_ms": { - "total": 7245, + "total": 2179, "by_step": { "coverage": 0, - "extract": 938, - "exclusion_read": 884, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 152, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 13359, "jev_output_tokens": 2855 @@ -70,39 +70,33 @@ "parts": [ { "variable_text": "mortality", - "warnings": [ - { - "code": "membership_unverified", - "severity": "warn", - "message": "the full set of series behind this answer could not be confirmed, so it uses the series the search found; a dataset made from it may hold different series." - } - ], + "warnings": [], "timing_ms": { - "total": 6280, + "total": 2172, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 5, - "shape_probe": 284, - "shape_groups": 7, + "shape_arcs": 1, + "shape_probe": 90, + "shape_groups": 5, "shape_labels": 1, "shape_admission": 4, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 95, - "shape_rank": 23, - "shape": 437, + "shape_quantity": 88, + "shape_rank": 15, + "shape": 216, "phase_prune_and_rank": 0, - "bind": 145, - "phase_bind": 24, + "bind": 141, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 561, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 292, - "phase_materialise": 14, - "answer": 97, - "phase_outcome": 4550 + "materialise": 16, + "phase_materialise": 23, + "answer": 26, + "phase_outcome": 1712 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -389,8 +383,9 @@ "label": "data source" } ], - "member_count": 2, - "refine_supported": true, + "member_count": 133, + "member_digest": "c090b56d31a596a8be16dafb518382db666c6b100a80534c3cb81dbfe3111c5d", + "refine_supported": false, "data_commons": [ { "id": "base", @@ -465,6 +460,7 @@ "stat_vars": { "member_count": 2, "member_count_exact": false, + "served_count": 1, "data_date_range": { "start": "2013", "end": "2022" @@ -806,7 +802,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -989,7 +985,7 @@ "label": "data source" } ], - "member_count": 2978, + "member_count": 2979, "refine_supported": true, "data_commons": [ { @@ -2359,7 +2355,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2659,7 +2655,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "9ceb8ef9c2e348a3b4acd719cc158577" + "x-dfo-trace-id": "ebef0ee209ee4987b258543a6e166566" }, "json": { "schema_version": 1, @@ -2668,11 +2664,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "9ceb8ef9c2e348a3b4acd719cc158577", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "ebef0ee209ee4987b258543a6e166566", "warnings": [], "timing_ms": { - "total": 587, + "total": 458, "by_step": { "coverage": 0 } @@ -2685,32 +2681,32 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 516, + "total": 409, "by_step": { "validate": 0, "phase_validate": 0, - "walk": 178, + "walk": 0, "reread_arcs": 0, "phase_reread_arcs": 0, - "detect_edits": 1, + "detect_edits": 0, "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 251, + "shape": 300, "phase_build_shape": 0, "bind": 0, "phase_build_bindings": 0, - "where_places": 0, + "where_places": 1, "phase_where_places": 0, - "materialise": 79, + "materialise": 103, "phase_materialise": 0, - "ground_related": 1, + "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, "answer": 2, "ground_gates": 0, - "phase_ground_build": 2, + "phase_ground_build": 1, "finalize_preview": 0, "options": 0, "finalize_related": 2, @@ -3235,7 +3231,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-by-label.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-by-label.json index 61c440b..3b8d56e 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-by-label.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-by-label.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "84b4f28565574e8bb1cb14cf3d4571af" + "x-dfo-trace-id": "aaf2ee5a8f71442a87eca115146a33a8" }, "json": { "schema_version": 1, @@ -45,21 +45,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8", "warnings": [], "timing_ms": { - "total": 7245, + "total": 2179, "by_step": { "coverage": 0, - "extract": 938, - "exclusion_read": 884, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 152, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 13359, "jev_output_tokens": 2855 @@ -70,39 +70,33 @@ "parts": [ { "variable_text": "mortality", - "warnings": [ - { - "code": "membership_unverified", - "severity": "warn", - "message": "the full set of series behind this answer could not be confirmed, so it uses the series the search found; a dataset made from it may hold different series." - } - ], + "warnings": [], "timing_ms": { - "total": 6280, + "total": 2172, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 5, - "shape_probe": 284, - "shape_groups": 7, + "shape_arcs": 1, + "shape_probe": 90, + "shape_groups": 5, "shape_labels": 1, "shape_admission": 4, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 95, - "shape_rank": 23, - "shape": 437, + "shape_quantity": 88, + "shape_rank": 15, + "shape": 216, "phase_prune_and_rank": 0, - "bind": 145, - "phase_bind": 24, + "bind": 141, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 561, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 292, - "phase_materialise": 14, - "answer": 97, - "phase_outcome": 4550 + "materialise": 16, + "phase_materialise": 23, + "answer": 26, + "phase_outcome": 1712 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -389,8 +383,9 @@ "label": "data source" } ], - "member_count": 2, - "refine_supported": true, + "member_count": 133, + "member_digest": "c090b56d31a596a8be16dafb518382db666c6b100a80534c3cb81dbfe3111c5d", + "refine_supported": false, "data_commons": [ { "id": "base", @@ -465,6 +460,7 @@ "stat_vars": { "member_count": 2, "member_count_exact": false, + "served_count": 1, "data_date_range": { "start": "2013", "end": "2022" @@ -806,7 +802,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -989,7 +985,7 @@ "label": "data source" } ], - "member_count": 2978, + "member_count": 2979, "refine_supported": true, "data_commons": [ { @@ -2359,7 +2355,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2641,7 +2637,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "9ceb8ef9c2e348a3b4acd719cc158577" + "x-dfo-trace-id": "ebef0ee209ee4987b258543a6e166566" }, "json": { "schema_version": 1, @@ -2650,11 +2646,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "9ceb8ef9c2e348a3b4acd719cc158577", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "ebef0ee209ee4987b258543a6e166566", "warnings": [], "timing_ms": { - "total": 587, + "total": 458, "by_step": { "coverage": 0 } @@ -2667,32 +2663,32 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 516, + "total": 409, "by_step": { "validate": 0, "phase_validate": 0, - "walk": 178, + "walk": 0, "reread_arcs": 0, "phase_reread_arcs": 0, - "detect_edits": 1, + "detect_edits": 0, "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 251, + "shape": 300, "phase_build_shape": 0, "bind": 0, "phase_build_bindings": 0, - "where_places": 0, + "where_places": 1, "phase_where_places": 0, - "materialise": 79, + "materialise": 103, "phase_materialise": 0, - "ground_related": 1, + "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, "answer": 2, "ground_gates": 0, - "phase_ground_build": 2, + "phase_ground_build": 1, "finalize_preview": 0, "options": 0, "finalize_related": 2, @@ -3208,7 +3204,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-echoes-assumptions.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-echoes-assumptions.json index 29d560a..de899fb 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-echoes-assumptions.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-echoes-assumptions.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:59:02Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:51:06Z" }, "call": [ { @@ -36,7 +36,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "86a65c1d256249ed8c254defa1aba17b" + "x-dfo-trace-id": "74c346a71b354edc85ccc10183a8bdbf" }, "json": { "schema_version": 1, @@ -47,21 +47,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "86a65c1d256249ed8c254defa1aba17b", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "74c346a71b354edc85ccc10183a8bdbf", "warnings": [], "timing_ms": { - "total": 4201, + "total": 2813, "by_step": { "coverage": 0, - "extract": 977, - "exclusion_read": 559, - "cache_lookup": 1 + "extract": 1, + "exclusion_read": 0, + "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2779, - "output_tokens": 222, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 21477, "jev_output_tokens": 4635 @@ -74,31 +74,31 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 3211, + "total": 2803, "by_step": { - "recall": 5, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 2, - "shape_probe": 104, - "shape_groups": 8, + "shape_probe": 87, + "shape_groups": 5, "shape_labels": 1, - "shape_admission": 10, + "shape_admission": 3, "phase_derive_shapes": 0, - "shape_denominators": 0, - "shape_quantity": 103, - "shape_rank": 27, - "shape": 267, + "shape_denominators": 1, + "shape_quantity": 117, + "shape_rank": 34, + "shape": 258, "phase_prune_and_rank": 0, - "bind": 173, - "phase_bind": 27, + "bind": 500, + "phase_bind": 15, "phase_settle": 1, - "phase_place_bindings": 33, + "phase_place_bindings": 22, "phase_facet_requests": 0, - "materialise": 1199, - "phase_materialise": 31, - "answer": 46, - "phase_outcome": 1429 + "materialise": 9, + "phase_materialise": 53, + "answer": 26, + "phase_outcome": 1917 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -804,7 +804,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2357,7 +2357,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2394,33 +2394,33 @@ } ], "timing_ms": { - "total": 3117, + "total": 1176, "by_step": { - "recall": 177, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 5, - "shape_probe": 109, - "shape_groups": 134, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 154, + "shape_groups": 103, "shape_labels": 0, - "shape_admission": 1, + "shape_admission": 16, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 102, - "shape_rank": 260, - "shape": 612, + "shape_quantity": 90, + "shape_rank": 184, + "shape": 552, "phase_prune_and_rank": 0, - "bind": 211, - "phase_bind": 902, - "phase_settle": 71, - "phase_place_bindings": 101, + "bind": 116, + "phase_bind": 211, + "phase_settle": 6, + "phase_place_bindings": 90, "phase_facet_requests": 0, - "materialise": 30, - "phase_materialise": 5, - "answer": 798, - "options": 53, - "phase_outcome": 157 + "materialise": 22, + "phase_materialise": 3, + "answer": 7, + "options": 44, + "phase_outcome": 124 } }, "restatement": { @@ -2463,10 +2463,10 @@ ], "status": "definite", "spec": { - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "definition": { "schema_version": 1, - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -2517,6 +2517,12 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -2729,6 +2735,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2013", "end": "2022" @@ -2773,20 +2780,6 @@ "has_data": true, "observation_count": 10, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 10 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2013, "end_year": 2022 @@ -2837,7 +2830,7 @@ }, "download": { "rows": 10, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2013, @@ -2850,9 +2843,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -2861,7 +2854,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -2989,11 +2981,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3295,7 +3287,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3304,7 +3296,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -5318,10 +5310,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_f025379e211db08849c7f98c627e025c", + "id": "spec_d128bf4fdab3a45191ee3727f431cdda", "base": { "schema_version": 1, - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -5372,15 +5364,21 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_f025379e211db08849c7f98c627e025c:measure_basis", + "id": "spec_d128bf4fdab3a45191ee3727f431cdda:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -5448,7 +5446,7 @@ } ], "compiled": { - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -5499,11 +5497,25 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2013, + 2022 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -5565,7 +5577,7 @@ } } ], - "rendered_sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", + "rendered_sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", "sentence_plan": [ { "kind": "text", @@ -5799,7 +5811,7 @@ }, { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -6135,6 +6147,12 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "entity_groups": { @@ -6172,7 +6190,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "2fd31832873d41f7b2adc82dd3d1ee1e" + "x-dfo-trace-id": "b3c46d24f0e74efe843b392d2eea0fca" }, "json": { "schema_version": 1, @@ -6181,11 +6199,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "2fd31832873d41f7b2adc82dd3d1ee1e", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "b3c46d24f0e74efe843b392d2eea0fca", "warnings": [], "timing_ms": { - "total": 351, + "total": 371, "by_step": { "coverage": 0 } @@ -6198,9 +6216,9 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 259, + "total": 320, "by_step": { - "validate": 1, + "validate": 0, "phase_validate": 0, "walk": 0, "reread_arcs": 0, @@ -6209,28 +6227,28 @@ "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 172, + "shape": 211, "phase_build_shape": 0, - "bind": 0, + "bind": 1, "phase_build_bindings": 0, "where_places": 0, "phase_where_places": 0, - "materialise": 78, + "materialise": 102, "phase_materialise": 0, - "ground_related": 1, + "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, "answer": 2, "ground_gates": 0, - "phase_ground_build": 2, + "phase_ground_build": 1, "finalize_preview": 0, - "options": 0, - "finalize_related": 2, + "options": 1, + "finalize_related": 1, "finalize_wholes": 0, - "finalize_relaunch": 0, + "finalize_relaunch": 1, "phase_finalize": 0, - "served_entry": 1 + "served_entry": 0 } }, "entity_refs": [], @@ -6739,7 +6757,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -6789,39 +6807,11 @@ "variable_text": "aid flows", "warnings": [], "timing_ms": { - "total": 103, + "total": 0, "by_step": { - "validate": 0, - "phase_validate": 0, - "walk": 1, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 0, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 21, - "phase_materialise": 0, - "ground_related": 0, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 10, - "ground_gates": 8, - "phase_ground_build": 57, - "finalize_preview": 0, - "options": 4, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, - "served_entry": 1 + "response_cache_part_memo": 0, + "served_entry": 0, + "as_composite": 0 } }, "entity_refs": [], @@ -6845,10 +6835,10 @@ ], "status": "definite", "spec": { - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "definition": { "schema_version": 1, - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -6899,6 +6889,12 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -7110,6 +7106,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2013", "end": "2022" @@ -7154,20 +7151,6 @@ "has_data": true, "observation_count": 10, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 10 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2013, "end_year": 2022 @@ -7218,7 +7201,7 @@ }, "download": { "rows": 10, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2013, @@ -7231,9 +7214,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -7242,7 +7225,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -7370,11 +7352,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -7676,7 +7658,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -7781,7 +7763,7 @@ "served_rows_exact": true } ], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -9798,7 +9780,7 @@ } } ], - "rendered_sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", + "rendered_sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", "sentence_plan": [ { "kind": "slot", @@ -9948,7 +9930,7 @@ }, { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -10194,10 +10176,10 @@ "answer": { "kind": "resolution", "status": "mixed", - "sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", + "sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", "complete": false, "specs": [ - "spec_f025379e211db08849c7f98c627e025c" + "spec_d128bf4fdab3a45191ee3727f431cdda" ], "gaps": [ { @@ -10212,11 +10194,11 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", + "sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", "complete": true, "specs": [ "spec_10bf62f9687154286b463d206f03a086", - "spec_f025379e211db08849c7f98c627e025c" + "spec_d128bf4fdab3a45191ee3727f431cdda" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-two-parts.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-two-parts.json index a6b2706..7ade21d 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-two-parts.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-candidate-two-parts.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:33Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:51Z" }, "call": [ { @@ -39,7 +39,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "fdb0b0f55c924eb98a73ed7b7bc9d2d9" + "x-dfo-trace-id": "ab69fb8ec0ac4ca38d9567bad212f272" }, "json": { "schema_version": 1, @@ -50,21 +50,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "fdb0b0f55c924eb98a73ed7b7bc9d2d9", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "ab69fb8ec0ac4ca38d9567bad212f272", "warnings": [], "timing_ms": { - "total": 6487, + "total": 3868, "by_step": { "coverage": 0, - "extract": 1075, - "exclusion_read": 711, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2785, - "output_tokens": 215, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 27063, "jev_output_tokens": 5672 @@ -77,31 +77,31 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 5328, + "total": 3810, "by_step": { - "recall": 2, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 2, - "shape_probe": 140, - "shape_groups": 13, + "shape_probe": 146, + "shape_groups": 5, "shape_labels": 1, - "shape_admission": 96, + "shape_admission": 3, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 106, - "shape_rank": 23, - "shape": 399, + "shape_quantity": 1231, + "shape_rank": 40, + "shape": 1436, "phase_prune_and_rank": 0, - "bind": 1565, - "phase_bind": 17, - "phase_settle": 2, - "phase_place_bindings": 41, + "bind": 138, + "phase_bind": 13, + "phase_settle": 1, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 799, - "phase_materialise": 31, - "answer": 42, - "phase_outcome": 2430 + "materialise": 15, + "phase_materialise": 21, + "answer": 26, + "phase_outcome": 2135 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -807,7 +807,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2360,7 +2360,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2386,33 +2386,33 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 4102, + "total": 3858, "by_step": { - "recall": 3, - "phase_resolve_places": 64, + "recall": 1, + "phase_resolve_places": 4, "phase_check_entities": 0, - "shape_arcs": 2, + "shape_arcs": 1, "shape_probe": 0, - "shape_groups": 166, - "shape_labels": 20, - "shape_admission": 103, + "shape_groups": 108, + "shape_labels": 10, + "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 136, - "shape_rank": 7, - "shape_availability": 199, - "shape": 2104, + "shape_quantity": 71, + "shape_rank": 5, + "shape_availability": 357, + "shape": 1742, "phase_prune_and_rank": 0, - "bind": 180, - "phase_bind": 652, - "phase_settle": 13, - "phase_place_bindings": 15, + "bind": 766, + "phase_bind": 14, + "phase_settle": 16, + "phase_place_bindings": 39, "phase_facet_requests": 0, - "materialise": 334, - "phase_materialise": 28, - "answer": 140, - "options": 323, - "phase_outcome": 246 + "materialise": 220, + "phase_materialise": 25, + "answer": 363, + "options": 427, + "phase_outcome": 241 } }, "restatement": { @@ -4905,7 +4905,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -6444,7 +6444,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -9017,7 +9017,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ed534d97c7b94231beeec6b082bd5952" + "x-dfo-trace-id": "e4aa344e426a44218ef4e20f6247f968" }, "json": { "schema_version": 1, @@ -9026,11 +9026,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ed534d97c7b94231beeec6b082bd5952", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "e4aa344e426a44218ef4e20f6247f968", "warnings": [], "timing_ms": { - "total": 3130, + "total": 488, "by_step": { "coverage": 0 } @@ -9043,7 +9043,7 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 253, + "total": 438, "by_step": { "validate": 0, "phase_validate": 0, @@ -9054,25 +9054,25 @@ "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 154, + "shape": 181, "phase_build_shape": 0, - "bind": 0, + "bind": 1, "phase_build_bindings": 0, "where_places": 0, - "phase_where_places": 1, - "materialise": 92, - "phase_materialise": 0, + "phase_where_places": 0, + "materialise": 161, + "phase_materialise": 1, "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, "answer": 1, "ground_gates": 0, - "phase_ground_build": 3, + "phase_ground_build": 2, "finalize_preview": 0, - "options": 1, - "finalize_related": 1, - "finalize_wholes": 0, + "options": 0, + "finalize_related": 90, + "finalize_wholes": 1, "finalize_relaunch": 0, "phase_finalize": 0, "served_entry": 0 @@ -9584,7 +9584,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -9634,39 +9634,10 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 3104, + "total": 1, "by_step": { - "validate": 0, - "phase_validate": 0, - "walk": 0, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 2435, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 201, - "phase_materialise": 1, - "ground_related": 0, - "ground_units": 0, - "ground_facets": 10, - "ground_convert": 0, - "answer": 12, - "ground_gates": 97, - "phase_ground_build": 80, - "finalize_preview": 0, - "options": 97, - "finalize_related": 168, - "finalize_wholes": 1, - "finalize_relaunch": 0, - "phase_finalize": 1, - "served_entry": 0 + "response_cache_part_memo": 0, + "served_entry": 1 } }, "entity_refs": [], @@ -11798,7 +11769,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -12204,7 +12175,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "050a70a152ba4a98a2bcb3d2b14e19d0" + "x-dfo-trace-id": "6e013b2ba151426784ed376bb11fd38a" }, "json": { "schema_version": 1, @@ -12415,7 +12386,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261023T061534Z-06fa7b89", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:03.390780+00:00" + "confirmed_at": "2026-11-15T21:45:20.198434+00:00" }, "warnings": [], "diagnostics": [ @@ -12615,7 +12586,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A38f1b5db24567c68f9791ac00bce803082c607f23c78688edf2d95e0778a070a?X-Goog-Signature=redacted", - "x-dfo-trace-id": "6e26170fae5b4b2891d4723a42ed9302" + "x-dfo-trace-id": "4426b167d59f4d839eb2d1d7f1105d9a" } } }, @@ -12757,7 +12728,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "16bf9309f1f04ccf85bd7d644587cd02" + "x-dfo-trace-id": "7961049a8186475eacd05bc5aa7be7f3" }, "json": { "schema_version": 1, @@ -12985,7 +12956,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261023T061534Z-06fa7b89", "served_from": "head", - "confirmed_at": "2026-11-14T13:58:45.318866+00:00" + "confirmed_at": "2026-11-15T21:48:19.617528+00:00" }, "warnings": [ { @@ -13212,7 +13183,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Aaf952b05a7ac047731b039b51f8876806d9c89beba61b9e94c5f552a75f175ef?X-Goog-Signature=redacted", - "x-dfo-trace-id": "c9619b22c8f94a74ad8743ed0a255a22" + "x-dfo-trace-id": "c786acb0bf8842dba767ce70de6da51c" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-echo-drops-malformed-items.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-echo-drops-malformed-items.json index b61b453..265dd30 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-echo-drops-malformed-items.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-echo-drops-malformed-items.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "86a65c1d256249ed8c254defa1aba17b" + "x-dfo-trace-id": "74c346a71b354edc85ccc10183a8bdbf" }, "json": { "schema_version": 1, @@ -46,21 +46,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "86a65c1d256249ed8c254defa1aba17b", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "74c346a71b354edc85ccc10183a8bdbf", "warnings": [], "timing_ms": { - "total": 4201, + "total": 2813, "by_step": { "coverage": 0, - "extract": 977, - "exclusion_read": 559, - "cache_lookup": 1 + "extract": 1, + "exclusion_read": 0, + "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2779, - "output_tokens": 222, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 21477, "jev_output_tokens": 4635 @@ -73,31 +73,31 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 3211, + "total": 2803, "by_step": { - "recall": 5, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 2, - "shape_probe": 104, - "shape_groups": 8, + "shape_probe": 87, + "shape_groups": 5, "shape_labels": 1, - "shape_admission": 10, + "shape_admission": 3, "phase_derive_shapes": 0, - "shape_denominators": 0, - "shape_quantity": 103, - "shape_rank": 27, - "shape": 267, + "shape_denominators": 1, + "shape_quantity": 117, + "shape_rank": 34, + "shape": 258, "phase_prune_and_rank": 0, - "bind": 173, - "phase_bind": 27, + "bind": 500, + "phase_bind": 15, "phase_settle": 1, - "phase_place_bindings": 33, + "phase_place_bindings": 22, "phase_facet_requests": 0, - "materialise": 1199, - "phase_materialise": 31, - "answer": 46, - "phase_outcome": 1429 + "materialise": 9, + "phase_materialise": 53, + "answer": 26, + "phase_outcome": 1917 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -803,7 +803,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2356,7 +2356,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2400,33 +2400,33 @@ } ], "timing_ms": { - "total": 3117, + "total": 1176, "by_step": { - "recall": 177, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 5, - "shape_probe": 109, - "shape_groups": 134, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 154, + "shape_groups": 103, "shape_labels": 0, - "shape_admission": 1, + "shape_admission": 16, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 102, - "shape_rank": 260, - "shape": 612, + "shape_quantity": 90, + "shape_rank": 184, + "shape": 552, "phase_prune_and_rank": 0, - "bind": 211, - "phase_bind": 902, - "phase_settle": 71, - "phase_place_bindings": 101, + "bind": 116, + "phase_bind": 211, + "phase_settle": 6, + "phase_place_bindings": 90, "phase_facet_requests": 0, - "materialise": 30, - "phase_materialise": 5, - "answer": 798, - "options": 53, - "phase_outcome": 157 + "materialise": 22, + "phase_materialise": 3, + "answer": 7, + "options": 44, + "phase_outcome": 124 } }, "restatement": { @@ -2502,10 +2502,10 @@ ], "status": "definite", "spec": { - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "definition": { "schema_version": 1, - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -2556,6 +2556,12 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -2768,6 +2774,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2013", "end": "2022" @@ -2812,20 +2819,6 @@ "has_data": true, "observation_count": 10, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 10 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2013, "end_year": 2022 @@ -2876,7 +2869,7 @@ }, "download": { "rows": 10, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2013, @@ -2889,9 +2882,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -2900,7 +2893,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -3028,11 +3020,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3334,7 +3326,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3343,7 +3335,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -5357,10 +5349,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_f025379e211db08849c7f98c627e025c", + "id": "spec_d128bf4fdab3a45191ee3727f431cdda", "base": { "schema_version": 1, - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -5411,15 +5403,21 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_f025379e211db08849c7f98c627e025c:measure_basis", + "id": "spec_d128bf4fdab3a45191ee3727f431cdda:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -5487,7 +5485,7 @@ } ], "compiled": { - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -5538,11 +5536,25 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2013, + 2022 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -5604,7 +5616,7 @@ } } ], - "rendered_sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", + "rendered_sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", "sentence_plan": [ { "kind": "text", @@ -5838,7 +5850,7 @@ }, { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -6174,6 +6186,12 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "entity_groups": { @@ -6230,7 +6248,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "2fd31832873d41f7b2adc82dd3d1ee1e" + "x-dfo-trace-id": "b3c46d24f0e74efe843b392d2eea0fca" }, "json": { "schema_version": 1, @@ -6239,11 +6257,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "2fd31832873d41f7b2adc82dd3d1ee1e", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "b3c46d24f0e74efe843b392d2eea0fca", "warnings": [], "timing_ms": { - "total": 351, + "total": 371, "by_step": { "coverage": 0 } @@ -6256,9 +6274,9 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 259, + "total": 320, "by_step": { - "validate": 1, + "validate": 0, "phase_validate": 0, "walk": 0, "reread_arcs": 0, @@ -6267,28 +6285,28 @@ "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 172, + "shape": 211, "phase_build_shape": 0, - "bind": 0, + "bind": 1, "phase_build_bindings": 0, "where_places": 0, "phase_where_places": 0, - "materialise": 78, + "materialise": 102, "phase_materialise": 0, - "ground_related": 1, + "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, "answer": 2, "ground_gates": 0, - "phase_ground_build": 2, + "phase_ground_build": 1, "finalize_preview": 0, - "options": 0, - "finalize_related": 2, + "options": 1, + "finalize_related": 1, "finalize_wholes": 0, - "finalize_relaunch": 0, + "finalize_relaunch": 1, "phase_finalize": 0, - "served_entry": 1 + "served_entry": 0 } }, "entity_refs": [], @@ -6797,7 +6815,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -6847,39 +6865,11 @@ "variable_text": "aid flows", "warnings": [], "timing_ms": { - "total": 103, + "total": 0, "by_step": { - "validate": 0, - "phase_validate": 0, - "walk": 1, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 0, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 21, - "phase_materialise": 0, - "ground_related": 0, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 10, - "ground_gates": 8, - "phase_ground_build": 57, - "finalize_preview": 0, - "options": 4, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, - "served_entry": 1 + "response_cache_part_memo": 0, + "served_entry": 0, + "as_composite": 0 } }, "entity_refs": [], @@ -6903,10 +6893,10 @@ ], "status": "definite", "spec": { - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "definition": { "schema_version": 1, - "spec_id": "spec_f025379e211db08849c7f98c627e025c", + "spec_id": "spec_d128bf4fdab3a45191ee3727f431cdda", "identity": { "identity_version": "spec1", "shape": { @@ -6957,6 +6947,12 @@ "kind": "range", "start_year": 2013, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -7168,6 +7164,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2013", "end": "2022" @@ -7212,20 +7209,6 @@ "has_data": true, "observation_count": 10, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 10 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2013, "end_year": 2022 @@ -7276,7 +7259,7 @@ }, "download": { "rows": 10, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2013, @@ -7289,9 +7272,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -7300,7 +7283,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -7428,11 +7410,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -7734,7 +7716,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -7839,7 +7821,7 @@ "served_rows_exact": true } ], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -9856,7 +9838,7 @@ } } ], - "rendered_sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", + "rendered_sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", "sentence_plan": [ { "kind": "slot", @@ -10006,7 +9988,7 @@ }, { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -10252,10 +10234,10 @@ "answer": { "kind": "resolution", "status": "mixed", - "sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", + "sentence": "Answered 1 of 2 parts. Mortality has 2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. No donor was named, so this shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, add \"for each donor\" to the question. Assumed: official development assistance.", "complete": false, "specs": [ - "spec_f025379e211db08849c7f98c627e025c" + "spec_d128bf4fdab3a45191ee3727f431cdda" ], "gaps": [ { @@ -10270,11 +10252,11 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", + "sentence": "Kenya's deaths rate per 1,000 people, 2013 to 2022. World Development Indicators. This shows deaths rate, the closest measure the data holds. Net disbursements (bilateral flows) to Kenya from official donors (DAC) for official development assistance, 2013 to 2022. Current US dollars · OECD DAC2a. This shows official donors (DAC), the source's total for every official donor. Private donors are outside it. To list each donor, search again with open_roles ['donor']. Assumed: official development assistance.", "complete": true, "specs": [ "spec_10bf62f9687154286b463d206f03a086", - "spec_f025379e211db08849c7f98c627e025c" + "spec_d128bf4fdab3a45191ee3727f431cdda" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-echoes-separate-and-operations.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-echoes-separate-and-operations.json index 57833dc..c6d91f5 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-echoes-separate-and-operations.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-echoes-separate-and-operations.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ca14efb6b6eb41c4b743a53b07d65497" + "x-dfo-trace-id": "1cd390ecb4974ec2910573f90daa1618" }, "json": { "schema_version": 1, @@ -43,27 +43,23 @@ "entry_path": "raw_text", "raw_query": "GDP of the G20 in 2015, and Germany India ODA", "normalized_query": "GDP of the G20 in 2015, and Germany India ODA", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ca14efb6b6eb41c4b743a53b07d65497", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "1cd390ecb4974ec2910573f90daa1618", "warnings": [], "timing_ms": { - "total": 5191, + "total": 3, "by_step": { - "coverage": 1, - "extract": 1593, - "exclusion_read": 582, - "cache_lookup": 0 + "coverage": 0, + "response_cache_layer1": 0 } }, "llm_usage": { - "input_tokens": 2773, - "output_tokens": 283, - "cached_tokens": 0, - "jev_input_tokens": 25232, - "jev_output_tokens": 5154 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -73,33 +69,33 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 3518, + "total": 3352, "by_step": { "recall": 3, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, + "shape_arcs": 1, "shape_probe": 0, - "shape_groups": 869, - "shape_labels": 17, - "shape_admission": 4, + "shape_groups": 690, + "shape_labels": 10, + "shape_admission": 3, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 141, - "shape_rank": 6, - "shape_availability": 200, - "shape": 2351, + "shape_quantity": 85, + "shape_rank": 4, + "shape_availability": 217, + "shape": 1834, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 22, - "phase_settle": 11, - "phase_place_bindings": 10, + "bind": 133, + "phase_bind": 15, + "phase_settle": 9, + "phase_place_bindings": 7, "phase_facet_requests": 0, - "materialise": 155, - "phase_materialise": 29, - "answer": 466, - "options": 171, - "phase_outcome": 146 + "materialise": 392, + "phase_materialise": 18, + "answer": 546, + "options": 240, + "phase_outcome": 155 } }, "restatement": { @@ -1951,7 +1947,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2851,7 +2847,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4905,27 +4901,27 @@ } ], "timing_ms": { - "total": 2523, + "total": 2647, "by_step": { - "recall": 872, + "recall": 2038, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 36, - "shape_probe": 106, - "shape_groups": 217, + "shape_arcs": 1, + "shape_probe_coverage": 7, + "shape_probe": 183, + "shape_groups": 142, "shape_labels": 0, - "shape_admission": 5, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 88, - "shape_rank": 3, - "shape": 1465, + "shape_quantity": 90, + "shape_rank": 2, + "shape": 462, "phase_prune_and_rank": 0, - "bind": 163, - "phase_bind": 6, - "phase_settle": 10, - "phase_place_bindings": 7 + "bind": 131, + "phase_bind": 4, + "phase_settle": 7, + "phase_place_bindings": 5 } }, "rendered_sentence": "Could not tell who is giving and who is receiving among \"Germany\" and \"India\". Put \"from\" or \"to\" before a name.", @@ -5348,7 +5344,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ea6191d7ae764c68b05485e60eeae959" + "x-dfo-trace-id": "fd01158f8a0d4ea0968db0047fa599c5" }, "json": { "schema_version": 1, @@ -5357,11 +5353,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ea6191d7ae764c68b05485e60eeae959", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "fd01158f8a0d4ea0968db0047fa599c5", "warnings": [], "timing_ms": { - "total": 1445, + "total": 1809, "by_step": { "coverage": 0 } @@ -5381,39 +5377,10 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 1422, + "total": 1, "by_step": { - "validate": 0, - "phase_validate": 0, - "walk": 0, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 982, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 202, - "phase_materialise": 0, - "ground_related": 1, - "ground_units": 0, - "ground_facets": 5, - "ground_convert": 0, - "answer": 5, - "ground_gates": 104, - "phase_ground_build": 8, - "finalize_preview": 0, - "options": 114, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, - "served_entry": 0 + "response_cache_part_memo": 0, + "served_entry": 1 } }, "entity_refs": [], @@ -6928,7 +6895,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -7010,33 +6977,33 @@ } ], "timing_ms": { - "total": 1182, + "total": 1801, "by_step": { - "recall": 5, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 1, - "shape_probe_coverage": 14, - "shape_probe": 94, - "shape_groups": 183, + "shape_probe_coverage": 7, + "shape_probe": 347, + "shape_groups": 775, "shape_labels": 0, - "shape_admission": 2, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 81, - "shape_rank": 88, - "shape": 513, + "shape_quantity": 66, + "shape_rank": 64, + "shape": 1292, "phase_prune_and_rank": 0, - "bind": 130, - "phase_bind": 151, - "phase_settle": 6, - "phase_place_bindings": 93, + "bind": 117, + "phase_bind": 120, + "phase_settle": 5, + "phase_place_bindings": 67, "phase_facet_requests": 0, - "materialise": 21, - "phase_materialise": 6, - "answer": 12, - "options": 24, - "phase_outcome": 221 + "materialise": 24, + "phase_materialise": 5, + "answer": 8, + "options": 43, + "phase_outcome": 119 } }, "restatement": { @@ -7074,10 +7041,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "definition": { "schema_version": 1, - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -7128,6 +7095,12 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -7340,6 +7313,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2015", "end": "2015" @@ -7369,20 +7343,6 @@ "has_data": true, "observation_count": 1, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2015, "end_year": 2015 @@ -7410,30 +7370,12 @@ "financingProvider": 1, "financingRecipient": 1 } - }, - { - "year": 2014, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } - }, - { - "year": 2013, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } } ] }, "download": { "rows": 1, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2015, @@ -7446,9 +7388,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -7457,7 +7399,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -7558,7 +7499,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -7589,7 +7530,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -7885,7 +7826,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -7894,7 +7835,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -9903,10 +9844,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86", "base": { "schema_version": 1, - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -9957,15 +9898,21 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58:measure_basis", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -10032,18 +9979,19 @@ ] }, { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58:provider", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86:provider", "axis": "provider", - "rule": "bilateral_recipient_total", + "rule": "bilateral_destinations", "provenance": "default", "active": "provider:bilateral", "options": [ { "option_id": "provider:bilateral", - "label": "bilateral flows only", + "label": "bilateral flows to countries and regions, without core contributions to multilateral agencies", "binding": { "kind": "provider", - "scope": "bilateral" + "scope": "bilateral", + "provenance": "provenance/ONEDAC2aBilateral" }, "availability": { "status": "available", @@ -10062,12 +10010,27 @@ "status": "available", "detail": {} } + }, + { + "option_id": "provider:contributions", + "label": "total ODA, including core contributions to multilateral agencies", + "binding": { + "kind": "provider", + "scope": "contributions" + }, + "availability": { + "status": "unavailable", + "code": "provider_not_offered", + "detail": { + "why": "destination_bilateral" + } + } } ] } ], "compiled": { - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -10118,11 +10081,25 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2015, + 2015 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -10184,7 +10161,7 @@ } } ], - "rendered_sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "rendered_sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -10395,7 +10372,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -10589,11 +10566,11 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "complete": true, "specs": [ "spec_66fdfe785d6a2bc455d49daaf76d6f89", - "spec_48c08bc25a7d3354c841e071e1d7eb58" + "spec_feb9e6a7dec891771bb823ff24ceca86" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-option-beside-definite.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-option-beside-definite.json index 26314ef..486d32a 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-option-beside-definite.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-option-beside-definite.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:55Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:51:03Z" }, "call": [ { @@ -36,7 +36,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ca14efb6b6eb41c4b743a53b07d65497" + "x-dfo-trace-id": "1cd390ecb4974ec2910573f90daa1618" }, "json": { "schema_version": 1, @@ -44,27 +44,23 @@ "entry_path": "raw_text", "raw_query": "GDP of the G20 in 2015, and Germany India ODA", "normalized_query": "GDP of the G20 in 2015, and Germany India ODA", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ca14efb6b6eb41c4b743a53b07d65497", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "1cd390ecb4974ec2910573f90daa1618", "warnings": [], "timing_ms": { - "total": 5191, + "total": 3, "by_step": { - "coverage": 1, - "extract": 1593, - "exclusion_read": 582, - "cache_lookup": 0 + "coverage": 0, + "response_cache_layer1": 0 } }, "llm_usage": { - "input_tokens": 2773, - "output_tokens": 283, - "cached_tokens": 0, - "jev_input_tokens": 25232, - "jev_output_tokens": 5154 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -74,33 +70,33 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 3518, + "total": 3352, "by_step": { "recall": 3, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, + "shape_arcs": 1, "shape_probe": 0, - "shape_groups": 869, - "shape_labels": 17, - "shape_admission": 4, + "shape_groups": 690, + "shape_labels": 10, + "shape_admission": 3, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 141, - "shape_rank": 6, - "shape_availability": 200, - "shape": 2351, + "shape_quantity": 85, + "shape_rank": 4, + "shape_availability": 217, + "shape": 1834, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 22, - "phase_settle": 11, - "phase_place_bindings": 10, + "bind": 133, + "phase_bind": 15, + "phase_settle": 9, + "phase_place_bindings": 7, "phase_facet_requests": 0, - "materialise": 155, - "phase_materialise": 29, - "answer": 466, - "options": 171, - "phase_outcome": 146 + "materialise": 392, + "phase_materialise": 18, + "answer": 546, + "options": 240, + "phase_outcome": 155 } }, "restatement": { @@ -1946,7 +1942,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2846,7 +2842,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4899,27 +4895,27 @@ } ], "timing_ms": { - "total": 2523, + "total": 2647, "by_step": { - "recall": 872, + "recall": 2038, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 36, - "shape_probe": 106, - "shape_groups": 217, + "shape_arcs": 1, + "shape_probe_coverage": 7, + "shape_probe": 183, + "shape_groups": 142, "shape_labels": 0, - "shape_admission": 5, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 88, - "shape_rank": 3, - "shape": 1465, + "shape_quantity": 90, + "shape_rank": 2, + "shape": 462, "phase_prune_and_rank": 0, - "bind": 163, - "phase_bind": 6, - "phase_settle": 10, - "phase_place_bindings": 7 + "bind": 131, + "phase_bind": 4, + "phase_settle": 7, + "phase_place_bindings": 5 } }, "rendered_sentence": "Could not tell who is giving and who is receiving among \"Germany\" and \"India\". Put \"from\" or \"to\" before a name.", @@ -5334,7 +5330,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ea6191d7ae764c68b05485e60eeae959" + "x-dfo-trace-id": "fd01158f8a0d4ea0968db0047fa599c5" }, "json": { "schema_version": 1, @@ -5343,11 +5339,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ea6191d7ae764c68b05485e60eeae959", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "fd01158f8a0d4ea0968db0047fa599c5", "warnings": [], "timing_ms": { - "total": 1445, + "total": 1809, "by_step": { "coverage": 0 } @@ -5367,39 +5363,10 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 1422, + "total": 1, "by_step": { - "validate": 0, - "phase_validate": 0, - "walk": 0, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 982, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 202, - "phase_materialise": 0, - "ground_related": 1, - "ground_units": 0, - "ground_facets": 5, - "ground_convert": 0, - "answer": 5, - "ground_gates": 104, - "phase_ground_build": 8, - "finalize_preview": 0, - "options": 114, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, - "served_entry": 0 + "response_cache_part_memo": 0, + "served_entry": 1 } }, "entity_refs": [], @@ -6914,7 +6881,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -6996,33 +6963,33 @@ } ], "timing_ms": { - "total": 1182, + "total": 1801, "by_step": { - "recall": 5, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 1, - "shape_probe_coverage": 14, - "shape_probe": 94, - "shape_groups": 183, + "shape_probe_coverage": 7, + "shape_probe": 347, + "shape_groups": 775, "shape_labels": 0, - "shape_admission": 2, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 81, - "shape_rank": 88, - "shape": 513, + "shape_quantity": 66, + "shape_rank": 64, + "shape": 1292, "phase_prune_and_rank": 0, - "bind": 130, - "phase_bind": 151, - "phase_settle": 6, - "phase_place_bindings": 93, + "bind": 117, + "phase_bind": 120, + "phase_settle": 5, + "phase_place_bindings": 67, "phase_facet_requests": 0, - "materialise": 21, - "phase_materialise": 6, - "answer": 12, - "options": 24, - "phase_outcome": 221 + "materialise": 24, + "phase_materialise": 5, + "answer": 8, + "options": 43, + "phase_outcome": 119 } }, "restatement": { @@ -7060,10 +7027,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "definition": { "schema_version": 1, - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -7114,6 +7081,12 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -7326,6 +7299,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2015", "end": "2015" @@ -7355,20 +7329,6 @@ "has_data": true, "observation_count": 1, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2015, "end_year": 2015 @@ -7396,30 +7356,12 @@ "financingProvider": 1, "financingRecipient": 1 } - }, - { - "year": 2014, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } - }, - { - "year": 2013, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } } ] }, "download": { "rows": 1, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2015, @@ -7432,9 +7374,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -7443,7 +7385,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -7544,7 +7485,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -7575,7 +7516,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -7871,7 +7812,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -7880,7 +7821,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -9889,10 +9830,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86", "base": { "schema_version": 1, - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -9943,15 +9884,21 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58:measure_basis", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -10018,18 +9965,19 @@ ] }, { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58:provider", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86:provider", "axis": "provider", - "rule": "bilateral_recipient_total", + "rule": "bilateral_destinations", "provenance": "default", "active": "provider:bilateral", "options": [ { "option_id": "provider:bilateral", - "label": "bilateral flows only", + "label": "bilateral flows to countries and regions, without core contributions to multilateral agencies", "binding": { "kind": "provider", - "scope": "bilateral" + "scope": "bilateral", + "provenance": "provenance/ONEDAC2aBilateral" }, "availability": { "status": "available", @@ -10048,12 +9996,27 @@ "status": "available", "detail": {} } + }, + { + "option_id": "provider:contributions", + "label": "total ODA, including core contributions to multilateral agencies", + "binding": { + "kind": "provider", + "scope": "contributions" + }, + "availability": { + "status": "unavailable", + "code": "provider_not_offered", + "detail": { + "why": "destination_bilateral" + } + } } ] } ], "compiled": { - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -10104,11 +10067,25 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2015, + 2015 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -10170,7 +10147,7 @@ } } ], - "rendered_sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "rendered_sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -10381,7 +10358,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -10575,11 +10552,11 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "complete": true, "specs": [ "spec_66fdfe785d6a2bc455d49daaf76d6f89", - "spec_48c08bc25a7d3354c841e071e1d7eb58" + "spec_feb9e6a7dec891771bb823ff24ceca86" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-option-two-part-query.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-option-two-part-query.json index aa73d3d..0713daa 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-option-two-part-query.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-option-two-part-query.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ff4acc343b1c4f6eb52d20c213ba7063" + "x-dfo-trace-id": "874eac3d4a174c319d424bdd2c3a41e2" }, "json": { "schema_version": 1, @@ -45,16 +45,16 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ff4acc343b1c4f6eb52d20c213ba7063", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "874eac3d4a174c319d424bdd2c3a41e2", "warnings": [], "timing_ms": { - "total": 10, + "total": 6, "by_step": { "coverage": 0, - "extract": 1, + "extract": 0, "exclusion_read": 0, - "cache_lookup": 1 + "cache_lookup": 0 } }, "llm_usage": { @@ -70,9 +70,9 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 2, + "total": 1, "by_step": { - "recall": 2, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -302,7 +302,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "ff4acc343b1c4f6eb52d20c213ba7063" + "trace_id": "874eac3d4a174c319d424bdd2c3a41e2" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-option-without-data-query.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-option-without-data-query.json index db1c65c..b05501d 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-option-without-data-query.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-option-without-data-query.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ff4acc343b1c4f6eb52d20c213ba7063" + "x-dfo-trace-id": "874eac3d4a174c319d424bdd2c3a41e2" }, "json": { "schema_version": 1, @@ -45,16 +45,16 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ff4acc343b1c4f6eb52d20c213ba7063", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "874eac3d4a174c319d424bdd2c3a41e2", "warnings": [], "timing_ms": { - "total": 10, + "total": 6, "by_step": { "coverage": 0, - "extract": 1, + "extract": 0, "exclusion_read": 0, - "cache_lookup": 1 + "cache_lookup": 0 } }, "llm_usage": { @@ -70,9 +70,9 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 2, + "total": 1, "by_step": { - "recall": 2, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -261,7 +261,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "ff4acc343b1c4f6eb52d20c213ba7063" + "trace_id": "874eac3d4a174c319d424bdd2c3a41e2" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-part-by-mention.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-part-by-mention.json index 06e0370..608b288 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-part-by-mention.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-part-by-mention.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:28Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:47Z" }, "call": [ { @@ -36,7 +36,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "b611300288804098822f87917e914466" + "x-dfo-trace-id": "f9014c13144b437b99151cbba8c5e58e" }, "json": { "schema_version": 1, @@ -47,14 +47,14 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "b611300288804098822f87917e914466", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "f9014c13144b437b99151cbba8c5e58e", "warnings": [], "timing_ms": { - "total": 9, + "total": 10, "by_step": { "coverage": 0, - "extract": 0, + "extract": 1, "exclusion_read": 0, "cache_lookup": 0 } @@ -72,9 +72,9 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 1, + "total": 5, "by_step": { - "recall": 1, + "recall": 5, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -299,7 +299,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "b7cff9154fcd4d639697f2510a90a537" + "x-dfo-trace-id": "9a44067e95e14e248110abbdaf4d87e5" }, "json": { "schema_version": 1, @@ -308,11 +308,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "b7cff9154fcd4d639697f2510a90a537", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "9a44067e95e14e248110abbdaf4d87e5", "warnings": [], "timing_ms": { - "total": 3, + "total": 2, "by_step": { "coverage": 0, "response_cache_layer2": 1 @@ -337,33 +337,33 @@ } ], "timing_ms": { - "total": 1070, + "total": 1880, "by_step": { - "recall": 1, + "recall": 0, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe_coverage": 9, - "shape_probe": 90, - "shape_groups": 121, + "shape_arcs": 0, + "shape_probe_coverage": 7, + "shape_probe": 999, + "shape_groups": 79, "shape_labels": 1, - "shape_admission": 1, + "shape_admission": 0, "phase_derive_shapes": 0, "shape_denominators": 0, "shape_quantity": 116, - "shape_rank": 114, - "shape": 484, + "shape_rank": 101, + "shape": 1325, "phase_prune_and_rank": 0, - "bind": 139, - "phase_bind": 132, + "bind": 143, + "phase_bind": 128, "phase_settle": 6, - "phase_place_bindings": 94, + "phase_place_bindings": 71, "phase_facet_requests": 0, - "materialise": 21, - "phase_materialise": 7, - "answer": 11, - "options": 35, - "phase_outcome": 140 + "materialise": 25, + "phase_materialise": 5, + "answer": 7, + "options": 49, + "phase_outcome": 121 } }, "restatement": { @@ -403,10 +403,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "definition": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -457,6 +457,12 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -669,6 +675,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2018", "end": "2018" @@ -698,20 +705,6 @@ "has_data": true, "observation_count": 1, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2018, "end_year": 2018 @@ -739,30 +732,12 @@ "financingProvider": 1, "financingRecipient": 1 } - }, - { - "year": 2017, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } - }, - { - "year": 2016, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } } ] }, "download": { "rows": 1, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2018, @@ -775,9 +750,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -786,7 +761,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -860,7 +834,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -891,7 +865,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -1187,7 +1161,7 @@ "start_year": 2018, "end_year": 2018 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -1196,7 +1170,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -3208,10 +3182,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "base": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -3262,15 +3236,21 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069:measure_basis", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -3337,18 +3317,19 @@ ] }, { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069:provider", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e:provider", "axis": "provider", - "rule": "bilateral_recipient_total", + "rule": "bilateral_destinations", "provenance": "default", "active": "provider:bilateral", "options": [ { "option_id": "provider:bilateral", - "label": "bilateral flows only", + "label": "bilateral flows to countries and regions, without core contributions to multilateral agencies", "binding": { "kind": "provider", - "scope": "bilateral" + "scope": "bilateral", + "provenance": "provenance/ONEDAC2aBilateral" }, "availability": { "status": "available", @@ -3367,12 +3348,27 @@ "status": "available", "detail": {} } + }, + { + "option_id": "provider:contributions", + "label": "total ODA, including core contributions to multilateral agencies", + "binding": { + "kind": "provider", + "scope": "contributions" + }, + "availability": { + "status": "unavailable", + "code": "provider_not_offered", + "detail": { + "why": "destination_bilateral" + } + } } ] } ], "compiled": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -3423,11 +3419,25 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2018, + 2018 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -3489,7 +3499,7 @@ } } ], - "rendered_sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -3523,7 +3533,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3707,10 +3717,10 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "complete": true, "specs": [ - "spec_8435999aa7036a9ab5ff61e26cc18069" + "spec_1f49edc1cb34ebb3ea772ca68f04a34e" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-place-one-part.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-place-one-part.json index c7fcdf3..9528450 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-place-one-part.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-place-one-part.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:26Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:47Z" }, "call": [ { @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ff4acc343b1c4f6eb52d20c213ba7063" + "x-dfo-trace-id": "874eac3d4a174c319d424bdd2c3a41e2" }, "json": { "schema_version": 1, @@ -46,16 +46,16 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ff4acc343b1c4f6eb52d20c213ba7063", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "874eac3d4a174c319d424bdd2c3a41e2", "warnings": [], "timing_ms": { - "total": 10, + "total": 6, "by_step": { "coverage": 0, - "extract": 1, + "extract": 0, "exclusion_read": 0, - "cache_lookup": 1 + "cache_lookup": 0 } }, "llm_usage": { @@ -71,9 +71,9 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 2, + "total": 1, "by_step": { - "recall": 2, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -298,7 +298,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "cd6446a0000d43bcbed6084d8b562df5" + "x-dfo-trace-id": "9250fd3536da4cdcb17897807dd24231" }, "json": { "schema_version": 1, @@ -307,21 +307,20 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "cd6446a0000d43bcbed6084d8b562df5", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "9250fd3536da4cdcb17897807dd24231", "warnings": [], "timing_ms": { - "total": 1077, + "total": 3, "by_step": { - "coverage": 0 + "coverage": 0, + "response_cache_layer2": 1 } }, "llm_usage": { "input_tokens": 0, "output_tokens": 0, - "cached_tokens": 0, - "jev_input_tokens": 7477, - "jev_output_tokens": 1674 + "cached_tokens": 0 }, "timed_out": false }, @@ -337,33 +336,33 @@ } ], "timing_ms": { - "total": 1070, + "total": 1880, "by_step": { - "recall": 1, + "recall": 0, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe_coverage": 9, - "shape_probe": 90, - "shape_groups": 121, + "shape_arcs": 0, + "shape_probe_coverage": 7, + "shape_probe": 999, + "shape_groups": 79, "shape_labels": 1, - "shape_admission": 1, + "shape_admission": 0, "phase_derive_shapes": 0, "shape_denominators": 0, "shape_quantity": 116, - "shape_rank": 114, - "shape": 484, + "shape_rank": 101, + "shape": 1325, "phase_prune_and_rank": 0, - "bind": 139, - "phase_bind": 132, + "bind": 143, + "phase_bind": 128, "phase_settle": 6, - "phase_place_bindings": 94, + "phase_place_bindings": 71, "phase_facet_requests": 0, - "materialise": 21, - "phase_materialise": 7, - "answer": 11, - "options": 35, - "phase_outcome": 140 + "materialise": 25, + "phase_materialise": 5, + "answer": 7, + "options": 49, + "phase_outcome": 121 } }, "restatement": { @@ -403,10 +402,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "definition": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -457,6 +456,12 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -669,6 +674,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2018", "end": "2018" @@ -698,20 +704,6 @@ "has_data": true, "observation_count": 1, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2018, "end_year": 2018 @@ -739,30 +731,12 @@ "financingProvider": 1, "financingRecipient": 1 } - }, - { - "year": 2017, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } - }, - { - "year": 2016, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } } ] }, "download": { "rows": 1, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2018, @@ -775,9 +749,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -786,7 +760,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -860,7 +833,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -891,7 +864,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -1187,7 +1160,7 @@ "start_year": 2018, "end_year": 2018 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -1196,7 +1169,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -3208,10 +3181,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "base": { "schema_version": 1, - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -3262,15 +3235,21 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069:measure_basis", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -3337,18 +3316,19 @@ ] }, { - "id": "spec_8435999aa7036a9ab5ff61e26cc18069:provider", + "id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e:provider", "axis": "provider", - "rule": "bilateral_recipient_total", + "rule": "bilateral_destinations", "provenance": "default", "active": "provider:bilateral", "options": [ { "option_id": "provider:bilateral", - "label": "bilateral flows only", + "label": "bilateral flows to countries and regions, without core contributions to multilateral agencies", "binding": { "kind": "provider", - "scope": "bilateral" + "scope": "bilateral", + "provenance": "provenance/ONEDAC2aBilateral" }, "availability": { "status": "available", @@ -3367,12 +3347,27 @@ "status": "available", "detail": {} } + }, + { + "option_id": "provider:contributions", + "label": "total ODA, including core contributions to multilateral agencies", + "binding": { + "kind": "provider", + "scope": "contributions" + }, + "availability": { + "status": "unavailable", + "code": "provider_not_offered", + "detail": { + "why": "destination_bilateral" + } + } } ] } ], "compiled": { - "spec_id": "spec_8435999aa7036a9ab5ff61e26cc18069", + "spec_id": "spec_1f49edc1cb34ebb3ea772ca68f04a34e", "identity": { "identity_version": "spec1", "shape": { @@ -3423,11 +3418,25 @@ "kind": "range", "start_year": 2018, "end_year": 2018 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2018, + 2018 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -3489,7 +3498,7 @@ } } ], - "rendered_sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -3523,7 +3532,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3707,10 +3716,10 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", + "sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance in 2018. Current US dollars · OECD DAC2a.", "complete": true, "specs": [ - "spec_8435999aa7036a9ab5ff61e26cc18069" + "spec_1f49edc1cb34ebb3ea772ca68f04a34e" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-place-two-parts.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-place-two-parts.json index 569e984..ae57326 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-place-two-parts.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-place-two-parts.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:28Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:48Z" }, "call": [ { @@ -36,7 +36,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "863fcb24613c4ca78c344ab4414e25c5" + "x-dfo-trace-id": "5319c51a8cc14509bb38616e0187c156" }, "json": { "schema_version": 1, @@ -47,14 +47,14 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "863fcb24613c4ca78c344ab4414e25c5", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "5319c51a8cc14509bb38616e0187c156", "warnings": [], "timing_ms": { - "total": 12, + "total": 9, "by_step": { "coverage": 0, - "extract": 1, + "extract": 0, "exclusion_read": 0, "cache_lookup": 0 } @@ -72,9 +72,9 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 3, + "total": 2, "by_step": { - "recall": 3, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -209,8 +209,8 @@ "timing_ms": { "total": 3, "by_step": { - "recall": 3, - "phase_resolve_places": 0, + "recall": 2, + "phase_resolve_places": 1, "phase_check_entities": 0 } }, @@ -481,7 +481,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "b53bd6834f474f5cb414eb4731b846f4" + "x-dfo-trace-id": "ffa8fb6983724162b8b4a48b6dafff23" }, "json": { "schema_version": 1, @@ -490,11 +490,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "b53bd6834f474f5cb414eb4731b846f4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "ffa8fb6983724162b8b4a48b6dafff23", "warnings": [], "timing_ms": { - "total": 1003, + "total": 1040, "by_step": { "coverage": 0 } @@ -522,9 +522,9 @@ "timing_ms": { "total": 3, "by_step": { - "recall": 3, + "recall": 2, "phase_resolve_places": 0, - "phase_check_entities": 0 + "phase_check_entities": 1 } }, "rendered_sentence": "\"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", @@ -666,33 +666,33 @@ } ], "timing_ms": { - "total": 994, + "total": 1031, "by_step": { "recall": 3, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe_coverage": 7, - "shape_probe": 8, - "shape_groups": 124, + "shape_arcs": 0, + "shape_probe_coverage": 6, + "shape_probe": 164, + "shape_groups": 78, "shape_labels": 1, "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 0, - "shape_quantity": 93, - "shape_rank": 157, - "shape": 422, + "shape_denominators": 1, + "shape_quantity": 144, + "shape_rank": 75, + "shape": 492, "phase_prune_and_rank": 0, - "bind": 138, - "phase_bind": 136, - "phase_settle": 6, - "phase_place_bindings": 89, + "bind": 109, + "phase_bind": 138, + "phase_settle": 5, + "phase_place_bindings": 68, "phase_facet_requests": 0, - "materialise": 17, - "phase_materialise": 8, - "answer": 11, - "options": 26, - "phase_outcome": 138 + "materialise": 26, + "phase_materialise": 6, + "answer": 8, + "options": 18, + "phase_outcome": 158 } }, "restatement": { @@ -731,10 +731,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_2e1f188265cd4f5123438ee26a59cc9e", + "spec_id": "spec_bd72a89e859771ac04e1082c6bdbede3", "definition": { "schema_version": 1, - "spec_id": "spec_2e1f188265cd4f5123438ee26a59cc9e", + "spec_id": "spec_bd72a89e859771ac04e1082c6bdbede3", "identity": { "identity_version": "spec1", "shape": { @@ -783,6 +783,12 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -964,7 +970,14 @@ "label": "time window" }, "binding": { - "kind": "unbound" + "kind": "value", + "value": { + "value_kind": "time_window", + "time_window": { + "start_year": 1960, + "end_year": 2024 + } + } }, "summable": false }, @@ -988,6 +1001,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "1960", "end": "2024" @@ -1017,20 +1031,10 @@ "has_data": true, "observation_count": 65, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 65 - }, - { - "label": "variables", - "count": 1 - } - ] + "window": { + "start_year": 1960, + "end_year": 2024 + } }, "headline": { "year": 2024, @@ -1073,7 +1077,7 @@ }, "download": { "rows": 65, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 1960, @@ -1086,9 +1090,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -1097,7 +1101,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -1225,7 +1228,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to Democratic Republic of the Congo for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -1256,7 +1259,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -1548,7 +1551,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -1557,7 +1560,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -3575,10 +3578,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_2e1f188265cd4f5123438ee26a59cc9e", + "id": "spec_bd72a89e859771ac04e1082c6bdbede3", "base": { "schema_version": 1, - "spec_id": "spec_2e1f188265cd4f5123438ee26a59cc9e", + "spec_id": "spec_bd72a89e859771ac04e1082c6bdbede3", "identity": { "identity_version": "spec1", "shape": { @@ -3627,15 +3630,21 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_2e1f188265cd4f5123438ee26a59cc9e:measure_basis", + "id": "spec_bd72a89e859771ac04e1082c6bdbede3:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -3702,18 +3711,19 @@ ] }, { - "id": "spec_2e1f188265cd4f5123438ee26a59cc9e:provider", + "id": "spec_bd72a89e859771ac04e1082c6bdbede3:provider", "axis": "provider", - "rule": "bilateral_recipient_total", + "rule": "bilateral_destinations", "provenance": "default", "active": "provider:bilateral", "options": [ { "option_id": "provider:bilateral", - "label": "bilateral flows only", + "label": "bilateral flows to countries and regions, without core contributions to multilateral agencies", "binding": { "kind": "provider", - "scope": "bilateral" + "scope": "bilateral", + "provenance": "provenance/ONEDAC2aBilateral" }, "availability": { "status": "available", @@ -3747,12 +3757,27 @@ "code": "imputed_coverage", "detail": {} } + }, + { + "option_id": "provider:contributions", + "label": "total ODA, including core contributions to multilateral agencies", + "binding": { + "kind": "provider", + "scope": "contributions" + }, + "availability": { + "status": "unavailable", + "code": "provider_not_offered", + "detail": { + "why": "destination_bilateral" + } + } } ] } ], "compiled": { - "spec_id": "spec_2e1f188265cd4f5123438ee26a59cc9e", + "spec_id": "spec_bd72a89e859771ac04e1082c6bdbede3", "identity": { "identity_version": "spec1", "shape": { @@ -3801,11 +3826,25 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 1960, + 2024 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -3865,7 +3904,7 @@ } } ], - "rendered_sentence": "Answered 1 of 2 parts. \"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific. Germany's net disbursements to Democratic Republic of the Congo for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Answered 1 of 2 parts. \"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific. Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "text", @@ -3946,7 +3985,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -4143,10 +4182,10 @@ "answer": { "kind": "resolution", "status": "mixed", - "sentence": "Answered 1 of 2 parts. \"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific. Germany's net disbursements to Democratic Republic of the Congo for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Answered 1 of 2 parts. \"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific. Germany's net disbursements (bilateral flows) to Democratic Republic of the Congo for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", "complete": false, "specs": [ - "spec_2e1f188265cd4f5123438ee26a59cc9e" + "spec_bd72a89e859771ac04e1082c6bdbede3" ], "gaps": [ { diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-posts-unsupported-placeholder.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-posts-unsupported-placeholder.json index ad8c838..804e6c7 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-posts-unsupported-placeholder.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-posts-unsupported-placeholder.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ca14efb6b6eb41c4b743a53b07d65497" + "x-dfo-trace-id": "1cd390ecb4974ec2910573f90daa1618" }, "json": { "schema_version": 1, @@ -43,27 +43,23 @@ "entry_path": "raw_text", "raw_query": "GDP of the G20 in 2015, and Germany India ODA", "normalized_query": "GDP of the G20 in 2015, and Germany India ODA", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ca14efb6b6eb41c4b743a53b07d65497", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "1cd390ecb4974ec2910573f90daa1618", "warnings": [], "timing_ms": { - "total": 5191, + "total": 3, "by_step": { - "coverage": 1, - "extract": 1593, - "exclusion_read": 582, - "cache_lookup": 0 + "coverage": 0, + "response_cache_layer1": 0 } }, "llm_usage": { - "input_tokens": 2773, - "output_tokens": 283, - "cached_tokens": 0, - "jev_input_tokens": 25232, - "jev_output_tokens": 5154 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -73,33 +69,33 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 3518, + "total": 3352, "by_step": { "recall": 3, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, + "shape_arcs": 1, "shape_probe": 0, - "shape_groups": 869, - "shape_labels": 17, - "shape_admission": 4, + "shape_groups": 690, + "shape_labels": 10, + "shape_admission": 3, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 141, - "shape_rank": 6, - "shape_availability": 200, - "shape": 2351, + "shape_quantity": 85, + "shape_rank": 4, + "shape_availability": 217, + "shape": 1834, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 22, - "phase_settle": 11, - "phase_place_bindings": 10, + "bind": 133, + "phase_bind": 15, + "phase_settle": 9, + "phase_place_bindings": 7, "phase_facet_requests": 0, - "materialise": 155, - "phase_materialise": 29, - "answer": 466, - "options": 171, - "phase_outcome": 146 + "materialise": 392, + "phase_materialise": 18, + "answer": 546, + "options": 240, + "phase_outcome": 155 } }, "entity_refs": [ @@ -155,27 +151,27 @@ } ], "timing_ms": { - "total": 2523, + "total": 2647, "by_step": { - "recall": 872, + "recall": 2038, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 36, - "shape_probe": 106, - "shape_groups": 217, + "shape_arcs": 1, + "shape_probe_coverage": 7, + "shape_probe": 183, + "shape_groups": 142, "shape_labels": 0, - "shape_admission": 5, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 88, - "shape_rank": 3, - "shape": 1465, + "shape_quantity": 90, + "shape_rank": 2, + "shape": 462, "phase_prune_and_rank": 0, - "bind": 163, - "phase_bind": 6, - "phase_settle": 10, - "phase_place_bindings": 7 + "bind": 131, + "phase_bind": 4, + "phase_settle": 7, + "phase_place_bindings": 5 } }, "rendered_sentence": "Could not tell who is giving and who is receiving among \"Germany\" and \"India\". Put \"from\" or \"to\" before a name.", @@ -514,7 +510,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ea6191d7ae764c68b05485e60eeae959" + "x-dfo-trace-id": "fd01158f8a0d4ea0968db0047fa599c5" }, "json": { "schema_version": 1, @@ -523,11 +519,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ea6191d7ae764c68b05485e60eeae959", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "fd01158f8a0d4ea0968db0047fa599c5", "warnings": [], "timing_ms": { - "total": 1445, + "total": 1809, "by_step": { "coverage": 0 } @@ -547,39 +543,10 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 1422, + "total": 1, "by_step": { - "validate": 0, - "phase_validate": 0, - "walk": 0, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 982, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 202, - "phase_materialise": 0, - "ground_related": 1, - "ground_units": 0, - "ground_facets": 5, - "ground_convert": 0, - "answer": 5, - "ground_gates": 104, - "phase_ground_build": 8, - "finalize_preview": 0, - "options": 114, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, - "served_entry": 0 + "response_cache_part_memo": 0, + "served_entry": 1 } }, "entity_refs": [], @@ -2094,7 +2061,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -2176,33 +2143,33 @@ } ], "timing_ms": { - "total": 1182, + "total": 1801, "by_step": { - "recall": 5, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, "shape_arcs": 1, - "shape_probe_coverage": 14, - "shape_probe": 94, - "shape_groups": 183, + "shape_probe_coverage": 7, + "shape_probe": 347, + "shape_groups": 775, "shape_labels": 0, - "shape_admission": 2, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 81, - "shape_rank": 88, - "shape": 513, + "shape_quantity": 66, + "shape_rank": 64, + "shape": 1292, "phase_prune_and_rank": 0, - "bind": 130, - "phase_bind": 151, - "phase_settle": 6, - "phase_place_bindings": 93, + "bind": 117, + "phase_bind": 120, + "phase_settle": 5, + "phase_place_bindings": 67, "phase_facet_requests": 0, - "materialise": 21, - "phase_materialise": 6, - "answer": 12, - "options": 24, - "phase_outcome": 221 + "materialise": 24, + "phase_materialise": 5, + "answer": 8, + "options": 43, + "phase_outcome": 119 } }, "restatement": { @@ -2240,10 +2207,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "definition": { "schema_version": 1, - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -2294,6 +2261,12 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -2506,6 +2479,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2015", "end": "2015" @@ -2535,20 +2509,6 @@ "has_data": true, "observation_count": 1, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2015, "end_year": 2015 @@ -2576,30 +2536,12 @@ "financingProvider": 1, "financingRecipient": 1 } - }, - { - "year": 2014, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } - }, - { - "year": 2013, - "observations": 1, - "series": 1, - "role_counts": { - "financingProvider": 1, - "financingRecipient": 1 - } } ] }, "download": { "rows": 1, - "rows_exact": true, + "rows_exact": false, "series": 1, "window": { "start_year": 2015, @@ -2612,9 +2554,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -2623,7 +2565,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -2724,7 +2665,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -2755,7 +2696,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3051,7 +2992,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3060,7 +3001,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -5069,10 +5010,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86", "base": { "schema_version": 1, - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -5123,15 +5064,21 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58:measure_basis", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -5198,18 +5145,19 @@ ] }, { - "id": "spec_48c08bc25a7d3354c841e071e1d7eb58:provider", + "id": "spec_feb9e6a7dec891771bb823ff24ceca86:provider", "axis": "provider", - "rule": "bilateral_recipient_total", + "rule": "bilateral_destinations", "provenance": "default", "active": "provider:bilateral", "options": [ { "option_id": "provider:bilateral", - "label": "bilateral flows only", + "label": "bilateral flows to countries and regions, without core contributions to multilateral agencies", "binding": { "kind": "provider", - "scope": "bilateral" + "scope": "bilateral", + "provenance": "provenance/ONEDAC2aBilateral" }, "availability": { "status": "available", @@ -5228,12 +5176,27 @@ "status": "available", "detail": {} } + }, + { + "option_id": "provider:contributions", + "label": "total ODA, including core contributions to multilateral agencies", + "binding": { + "kind": "provider", + "scope": "contributions" + }, + "availability": { + "status": "unavailable", + "code": "provider_not_offered", + "detail": { + "why": "destination_bilateral" + } + } } ] } ], "compiled": { - "spec_id": "spec_48c08bc25a7d3354c841e071e1d7eb58", + "spec_id": "spec_feb9e6a7dec891771bb823ff24ceca86", "identity": { "identity_version": "spec1", "shape": { @@ -5284,11 +5247,25 @@ "kind": "range", "start_year": 2015, "end_year": 2015 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2015, + 2015 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -5350,7 +5327,7 @@ } } ], - "rendered_sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "rendered_sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -5561,7 +5538,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -5758,11 +5735,11 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", + "sentence": "GDP in the 19 G20 members in 2015. Current US dollars · World Development Indicators. This shows the 19 G20 members, each on its own. Germany's net disbursements (bilateral flows) to India for official development assistance in 2015. Current US dollars · OECD DAC2a.", "complete": true, "specs": [ "spec_66fdfe785d6a2bc455d49daaf76d6f89", - "spec_48c08bc25a7d3354c841e071e1d7eb58" + "spec_feb9e6a7dec891771bb823ff24ceca86" ], "gaps": [] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-answered-part.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-answered-part.json index d94ea7e..4ea6d48 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-answered-part.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-answered-part.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "f0113be980e4445fbe353f7e65bd74a4" + "x-dfo-trace-id": "8d84cb6071184b50890ef1d463fcb67d" }, "json": { "schema_version": 1, @@ -46,21 +46,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -73,33 +73,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1290,7 +1290,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3277,20 +3277,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-label-in-two-groups.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-label-in-two-groups.json index e2b7299..f7fdc0a 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-label-in-two-groups.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-label-in-two-groups.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "326cd5bd811c420193834cb8336356f7" + "x-dfo-trace-id": "22720754908a43c59e56059ebe972d49" }, "json": { "schema_version": 1, @@ -42,24 +42,22 @@ "entry_path": "raw_text", "raw_query": "aid from Congo to Congo", "normalized_query": "aid from Congo to Congo", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "326cd5bd811c420193834cb8336356f7", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "22720754908a43c59e56059ebe972d49", "warnings": [], "timing_ms": { - "total": 1299, + "total": 1, "by_step": { "coverage": 0, - "extract": 1088, - "exclusion_read": 1045, - "cache_lookup": 0 + "response_cache_layer1": 0 } }, "llm_usage": { - "input_tokens": 2747, - "output_tokens": 176, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0 }, "timed_out": false @@ -70,9 +68,9 @@ "variable_text": "aid", "warnings": [], "timing_ms": { - "total": 204, + "total": 2021, "by_step": { - "recall": 204, + "recall": 2021, "phase_resolve_places": 0, "phase_check_entities": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-mention-names-two-parts.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-mention-names-two-parts.json index af89ae4..5ed0a86 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-mention-names-two-parts.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-mention-names-two-parts.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "bb77ea7f5f384de0a5f43efefc8af840" + "x-dfo-trace-id": "52161dd26d554215a59d13ec806a13c1" }, "json": { "schema_version": 1, @@ -46,21 +46,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "bb77ea7f5f384de0a5f43efefc8af840", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "52161dd26d554215a59d13ec806a13c1", "warnings": [], "timing_ms": { - "total": 2460, + "total": 8, "by_step": { "coverage": 0, - "extract": 1201, - "exclusion_read": 768, - "cache_lookup": 0 + "extract": 0, + "exclusion_read": 0, + "cache_lookup": 1 } }, "llm_usage": { - "input_tokens": 2765, - "output_tokens": 247, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0 }, "timed_out": false @@ -71,9 +71,9 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 4, + "total": 2, "by_step": { - "recall": 4, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -206,11 +206,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 6, + "total": 2, "by_step": { - "recall": 5, + "recall": 2, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-choice.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-choice.json index 2d3e027..6339d0f 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-choice.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-choice.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -45,22 +45,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -72,33 +72,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1205,7 +1205,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3357,7 +3357,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-options.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-options.json index 10ead15..5404116 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-options.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-no-options.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -45,22 +45,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -70,11 +70,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-option-out-of-range.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-option-out-of-range.json index de6d094..f4c9ea0 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-option-out-of-range.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-option-out-of-range.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "84b4f28565574e8bb1cb14cf3d4571af" + "x-dfo-trace-id": "aaf2ee5a8f71442a87eca115146a33a8" }, "json": { "schema_version": 1, @@ -45,21 +45,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8", "warnings": [], "timing_ms": { - "total": 7245, + "total": 2179, "by_step": { "coverage": 0, - "extract": 938, - "exclusion_read": 884, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 152, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 13359, "jev_output_tokens": 2855 @@ -70,39 +70,33 @@ "parts": [ { "variable_text": "mortality", - "warnings": [ - { - "code": "membership_unverified", - "severity": "warn", - "message": "the full set of series behind this answer could not be confirmed, so it uses the series the search found; a dataset made from it may hold different series." - } - ], + "warnings": [], "timing_ms": { - "total": 6280, + "total": 2172, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 5, - "shape_probe": 284, - "shape_groups": 7, + "shape_arcs": 1, + "shape_probe": 90, + "shape_groups": 5, "shape_labels": 1, "shape_admission": 4, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 95, - "shape_rank": 23, - "shape": 437, + "shape_quantity": 88, + "shape_rank": 15, + "shape": 216, "phase_prune_and_rank": 0, - "bind": 145, - "phase_bind": 24, + "bind": 141, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 561, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 292, - "phase_materialise": 14, - "answer": 97, - "phase_outcome": 4550 + "materialise": 16, + "phase_materialise": 23, + "answer": 26, + "phase_outcome": 1712 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -389,8 +383,9 @@ "label": "data source" } ], - "member_count": 2, - "refine_supported": true, + "member_count": 133, + "member_digest": "c090b56d31a596a8be16dafb518382db666c6b100a80534c3cb81dbfe3111c5d", + "refine_supported": false, "data_commons": [ { "id": "base", @@ -465,6 +460,7 @@ "stat_vars": { "member_count": 2, "member_count_exact": false, + "served_count": 1, "data_date_range": { "start": "2013", "end": "2022" @@ -806,7 +802,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -989,7 +985,7 @@ "label": "data source" } ], - "member_count": 2978, + "member_count": 2979, "refine_supported": true, "data_commons": [ { @@ -2359,7 +2355,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-part-without-variable-text.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-part-without-variable-text.json index a86dc9c..24e162b 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-part-without-variable-text.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-part-without-variable-text.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ca14efb6b6eb41c4b743a53b07d65497" + "x-dfo-trace-id": "1cd390ecb4974ec2910573f90daa1618" }, "json": { "schema_version": 1, @@ -43,27 +43,23 @@ "entry_path": "raw_text", "raw_query": "GDP of the G20 in 2015, and Germany India ODA", "normalized_query": "GDP of the G20 in 2015, and Germany India ODA", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ca14efb6b6eb41c4b743a53b07d65497", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "1cd390ecb4974ec2910573f90daa1618", "warnings": [], "timing_ms": { - "total": 5191, + "total": 3, "by_step": { - "coverage": 1, - "extract": 1593, - "exclusion_read": 582, - "cache_lookup": 0 + "coverage": 0, + "response_cache_layer1": 0 } }, "llm_usage": { - "input_tokens": 2773, - "output_tokens": 283, - "cached_tokens": 0, - "jev_input_tokens": 25232, - "jev_output_tokens": 5154 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -72,33 +68,33 @@ { "warnings": [], "timing_ms": { - "total": 3518, + "total": 3352, "by_step": { "recall": 3, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, + "shape_arcs": 1, "shape_probe": 0, - "shape_groups": 869, - "shape_labels": 17, - "shape_admission": 4, + "shape_groups": 690, + "shape_labels": 10, + "shape_admission": 3, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 141, - "shape_rank": 6, - "shape_availability": 200, - "shape": 2351, + "shape_quantity": 85, + "shape_rank": 4, + "shape_availability": 217, + "shape": 1834, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 22, - "phase_settle": 11, - "phase_place_bindings": 10, + "bind": 133, + "phase_bind": 15, + "phase_settle": 9, + "phase_place_bindings": 7, "phase_facet_requests": 0, - "materialise": 155, - "phase_materialise": 29, - "answer": 466, - "options": 171, - "phase_outcome": 146 + "materialise": 392, + "phase_materialise": 18, + "answer": 546, + "options": 240, + "phase_outcome": 155 } }, "restatement": { @@ -1944,7 +1940,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2844,7 +2840,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4897,27 +4893,27 @@ } ], "timing_ms": { - "total": 2523, + "total": 2647, "by_step": { - "recall": 872, + "recall": 2038, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 36, - "shape_probe": 106, - "shape_groups": 217, + "shape_arcs": 1, + "shape_probe_coverage": 7, + "shape_probe": 183, + "shape_groups": 142, "shape_labels": 0, - "shape_admission": 5, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 88, - "shape_rank": 3, - "shape": 1465, + "shape_quantity": 90, + "shape_rank": 2, + "shape": 462, "phase_prune_and_rank": 0, - "bind": 163, - "phase_bind": 6, - "phase_settle": 10, - "phase_place_bindings": 7 + "bind": 131, + "phase_bind": 4, + "phase_settle": 7, + "phase_place_bindings": 5 } }, "rendered_sentence": "Could not tell who is giving and who is receiving among \"Germany\" and \"India\". Put \"from\" or \"to\" before a name.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-candidate-label.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-candidate-label.json index cd8fb74..c2c3c2e 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-candidate-label.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-candidate-label.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "84b4f28565574e8bb1cb14cf3d4571af" + "x-dfo-trace-id": "aaf2ee5a8f71442a87eca115146a33a8" }, "json": { "schema_version": 1, @@ -45,21 +45,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8", "warnings": [], "timing_ms": { - "total": 7245, + "total": 2179, "by_step": { "coverage": 0, - "extract": 938, - "exclusion_read": 884, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 152, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 13359, "jev_output_tokens": 2855 @@ -70,39 +70,33 @@ "parts": [ { "variable_text": "mortality", - "warnings": [ - { - "code": "membership_unverified", - "severity": "warn", - "message": "the full set of series behind this answer could not be confirmed, so it uses the series the search found; a dataset made from it may hold different series." - } - ], + "warnings": [], "timing_ms": { - "total": 6280, + "total": 2172, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 5, - "shape_probe": 284, - "shape_groups": 7, + "shape_arcs": 1, + "shape_probe": 90, + "shape_groups": 5, "shape_labels": 1, "shape_admission": 4, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 95, - "shape_rank": 23, - "shape": 437, + "shape_quantity": 88, + "shape_rank": 15, + "shape": 216, "phase_prune_and_rank": 0, - "bind": 145, - "phase_bind": 24, + "bind": 141, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 561, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 292, - "phase_materialise": 14, - "answer": 97, - "phase_outcome": 4550 + "materialise": 16, + "phase_materialise": 23, + "answer": 26, + "phase_outcome": 1712 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -389,8 +383,9 @@ "label": "data source" } ], - "member_count": 2, - "refine_supported": true, + "member_count": 133, + "member_digest": "c090b56d31a596a8be16dafb518382db666c6b100a80534c3cb81dbfe3111c5d", + "refine_supported": false, "data_commons": [ { "id": "base", @@ -465,6 +460,7 @@ "stat_vars": { "member_count": 2, "member_count_exact": false, + "served_count": 1, "data_date_range": { "start": "2013", "end": "2022" @@ -806,7 +802,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -989,7 +985,7 @@ "label": "data source" } ], - "member_count": 2978, + "member_count": 2979, "refine_supported": true, "data_commons": [ { @@ -2307,7 +2303,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-label.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-label.json index 09a4654..bd6b071 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-label.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-shared-label.json @@ -45,16 +45,16 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ff4acc343b1c4f6eb52d20c213ba7063", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "874eac3d4a174c319d424bdd2c3a41e2", "warnings": [], "timing_ms": { - "total": 10, + "total": 6, "by_step": { "coverage": 0, - "extract": 1, + "extract": 0, "exclusion_read": 0, - "cache_lookup": 1 + "cache_lookup": 0 } }, "llm_usage": { @@ -70,9 +70,9 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 2, + "total": 1, "by_step": { - "recall": 2, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-two-choices.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-two-choices.json index 1359ad9..3588ae8 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-two-choices.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-two-choices.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "bb77ea7f5f384de0a5f43efefc8af840" + "x-dfo-trace-id": "52161dd26d554215a59d13ec806a13c1" }, "json": { "schema_version": 1, @@ -45,21 +45,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "bb77ea7f5f384de0a5f43efefc8af840", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "52161dd26d554215a59d13ec806a13c1", "warnings": [], "timing_ms": { - "total": 2460, + "total": 8, "by_step": { "coverage": 0, - "extract": 1201, - "exclusion_read": 768, - "cache_lookup": 0 + "extract": 0, + "exclusion_read": 0, + "cache_lookup": 1 } }, "llm_usage": { - "input_tokens": 2765, - "output_tokens": 247, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0 }, "timed_out": false @@ -70,9 +70,9 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 4, + "total": 2, "by_step": { - "recall": 4, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -205,11 +205,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 6, + "total": 2, "by_step": { - "recall": 5, + "recall": 2, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-candidate-label.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-candidate-label.json index 188eb2d..109c4f8 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-candidate-label.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-candidate-label.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "84b4f28565574e8bb1cb14cf3d4571af" + "x-dfo-trace-id": "aaf2ee5a8f71442a87eca115146a33a8" }, "json": { "schema_version": 1, @@ -45,21 +45,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "84b4f28565574e8bb1cb14cf3d4571af", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "aaf2ee5a8f71442a87eca115146a33a8", "warnings": [], "timing_ms": { - "total": 7245, + "total": 2179, "by_step": { "coverage": 0, - "extract": 938, - "exclusion_read": 884, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 152, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 13359, "jev_output_tokens": 2855 @@ -70,39 +70,33 @@ "parts": [ { "variable_text": "mortality", - "warnings": [ - { - "code": "membership_unverified", - "severity": "warn", - "message": "the full set of series behind this answer could not be confirmed, so it uses the series the search found; a dataset made from it may hold different series." - } - ], + "warnings": [], "timing_ms": { - "total": 6280, + "total": 2172, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 5, - "shape_probe": 284, - "shape_groups": 7, + "shape_arcs": 1, + "shape_probe": 90, + "shape_groups": 5, "shape_labels": 1, "shape_admission": 4, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 95, - "shape_rank": 23, - "shape": 437, + "shape_quantity": 88, + "shape_rank": 15, + "shape": 216, "phase_prune_and_rank": 0, - "bind": 145, - "phase_bind": 24, + "bind": 141, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 561, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 292, - "phase_materialise": 14, - "answer": 97, - "phase_outcome": 4550 + "materialise": 16, + "phase_materialise": 23, + "answer": 26, + "phase_outcome": 1712 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -389,8 +383,9 @@ "label": "data source" } ], - "member_count": 2, - "refine_supported": true, + "member_count": 133, + "member_digest": "c090b56d31a596a8be16dafb518382db666c6b100a80534c3cb81dbfe3111c5d", + "refine_supported": false, "data_commons": [ { "id": "base", @@ -465,6 +460,7 @@ "stat_vars": { "member_count": 2, "member_count_exact": false, + "served_count": 1, "data_date_range": { "start": "2013", "end": "2022" @@ -806,7 +802,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -989,7 +985,7 @@ "label": "data source" } ], - "member_count": 2978, + "member_count": 2979, "refine_supported": true, "data_commons": [ { @@ -2359,7 +2355,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-label.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-label.json index ca1e8d6..1c0716a 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-label.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-label.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -45,22 +45,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -70,11 +70,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-part.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-part.json index eec0a15..7ebcdb7 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-part.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-part.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "f0113be980e4445fbe353f7e65bd74a4" + "x-dfo-trace-id": "8d84cb6071184b50890ef1d463fcb67d" }, "json": { "schema_version": 1, @@ -46,21 +46,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "f0113be980e4445fbe353f7e65bd74a4", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "8d84cb6071184b50890ef1d463fcb67d", "warnings": [], "timing_ms": { - "total": 1823, + "total": 464, "by_step": { "coverage": 0, - "extract": 934, - "exclusion_read": 563, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2759, - "output_tokens": 182, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 6062, "jev_output_tokens": 1263 @@ -73,33 +73,33 @@ "variable_text": "debt service", "warnings": [], "timing_ms": { - "total": 880, + "total": 456, "by_step": { - "recall": 236, + "recall": 1, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 8, - "shape_probe": 134, - "shape_groups": 8, - "shape_labels": 14, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 101, + "shape_groups": 5, + "shape_labels": 10, "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 82, - "shape_rank": 2, - "shape": 260, + "shape_quantity": 90, + "shape_rank": 1, + "shape": 222, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 16, - "phase_settle": 18, - "phase_place_bindings": 18, + "bind": 122, + "phase_bind": 11, + "phase_settle": 12, + "phase_place_bindings": 10, "phase_facet_requests": 0, - "materialise": 12, - "phase_materialise": 25, - "answer": 3, - "options": 67, - "phase_outcome": 71 + "materialise": 8, + "phase_materialise": 18, + "answer": 2, + "options": 5, + "phase_outcome": 45 } }, "restatement": { @@ -1290,7 +1290,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3277,20 +3277,20 @@ "variable_text": "price of tea", "warnings": [], "timing_ms": { - "total": 333, + "total": 114, "by_step": { - "recall": 220, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 1, - "shape_probe": 102, + "shape_arcs": 0, + "shape_probe": 95, "shape_groups": 1, "shape_labels": 0, - "shape_admission": 1, - "phase_derive_shapes": 0, - "shape_denominators": 0, + "shape_admission": 9, + "phase_derive_shapes": 1, + "shape_denominators": 1, "shape_quantity": 0, - "shape": 113, + "shape": 111, "phase_prune_and_rank": 0 } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-status.json b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-status.json index 5c68ce3..a638482 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-status.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/choose-refused-unknown-status.json @@ -35,7 +35,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ca14efb6b6eb41c4b743a53b07d65497" + "x-dfo-trace-id": "1cd390ecb4974ec2910573f90daa1618" }, "json": { "schema_version": 1, @@ -43,27 +43,23 @@ "entry_path": "raw_text", "raw_query": "GDP of the G20 in 2015, and Germany India ODA", "normalized_query": "GDP of the G20 in 2015, and Germany India ODA", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "ca14efb6b6eb41c4b743a53b07d65497", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "1cd390ecb4974ec2910573f90daa1618", "warnings": [], "timing_ms": { - "total": 5191, + "total": 3, "by_step": { - "coverage": 1, - "extract": 1593, - "exclusion_read": 582, - "cache_lookup": 0 + "coverage": 0, + "response_cache_layer1": 0 } }, "llm_usage": { - "input_tokens": 2773, - "output_tokens": 283, - "cached_tokens": 0, - "jev_input_tokens": 25232, - "jev_output_tokens": 5154 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -73,33 +69,33 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 3518, + "total": 3352, "by_step": { "recall": 3, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, + "shape_arcs": 1, "shape_probe": 0, - "shape_groups": 869, - "shape_labels": 17, - "shape_admission": 4, + "shape_groups": 690, + "shape_labels": 10, + "shape_admission": 3, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 141, - "shape_rank": 6, - "shape_availability": 200, - "shape": 2351, + "shape_quantity": 85, + "shape_rank": 4, + "shape_availability": 217, + "shape": 1834, "phase_prune_and_rank": 0, - "bind": 154, - "phase_bind": 22, - "phase_settle": 11, - "phase_place_bindings": 10, + "bind": 133, + "phase_bind": 15, + "phase_settle": 9, + "phase_place_bindings": 7, "phase_facet_requests": 0, - "materialise": 155, - "phase_materialise": 29, - "answer": 466, - "options": 171, - "phase_outcome": 146 + "materialise": 392, + "phase_materialise": 18, + "answer": 546, + "options": 240, + "phase_outcome": 155 } }, "entity_refs": [ @@ -1934,7 +1930,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2834,7 +2830,7 @@ "start_year": 2015, "end_year": 2015 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4887,27 +4883,27 @@ } ], "timing_ms": { - "total": 2523, + "total": 2647, "by_step": { - "recall": 872, + "recall": 2038, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 36, - "shape_probe": 106, - "shape_groups": 217, + "shape_arcs": 1, + "shape_probe_coverage": 7, + "shape_probe": 183, + "shape_groups": 142, "shape_labels": 0, - "shape_admission": 5, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 88, - "shape_rank": 3, - "shape": 1465, + "shape_quantity": 90, + "shape_rank": 2, + "shape": 462, "phase_prune_and_rank": 0, - "bind": 163, - "phase_bind": 6, - "phase_settle": 10, - "phase_place_bindings": 7 + "bind": 131, + "phase_bind": 4, + "phase_settle": 7, + "phase_place_bindings": 5 } }, "rendered_sentence": "Could not tell who is giving and who is receiving among \"Germany\" and \"India\". Put \"from\" or \"to\" before a name.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-frame-several-readings.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-frame-several-readings.json index 3c0d358..d84a1cc 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-frame-several-readings.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-frame-several-readings.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "b371e251aceb4b8bb0ec11326539902e" + "x-dfo-trace-id": "32a6877df5574b0297dede72b16cf212" }, "json": { "schema_version": 1, @@ -42,27 +42,23 @@ "entry_path": "raw_text", "raw_query": "ODA disbursements for health and for education from Germany to Kenya, and GDP of Kenya", "normalized_query": "ODA disbursements for health and for education from Germany to Kenya, and GDP of Kenya", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "b371e251aceb4b8bb0ec11326539902e", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "32a6877df5574b0297dede72b16cf212", "warnings": [], "timing_ms": { - "total": 6200, + "total": 7, "by_step": { "coverage": 0, - "extract": 1113, - "exclusion_read": 524, - "cache_lookup": 1 + "response_cache_layer1": 1 } }, "llm_usage": { - "input_tokens": 2769, - "output_tokens": 193, - "cached_tokens": 978, - "jev_input_tokens": 26122, - "jev_output_tokens": 6124 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -72,33 +68,33 @@ "variable_text": "ODA disbursements for health", "warnings": [], "timing_ms": { - "total": 4795, + "total": 4556, "by_step": { - "recall": 677, - "phase_resolve_places": 1, + "recall": 854, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 4, - "shape_probe": 125, - "shape_groups": 857, - "shape_labels": 23, - "shape_admission": 2, + "shape_arcs": 1, + "shape_probe_coverage": 5, + "shape_probe": 189, + "shape_groups": 103, + "shape_labels": 39, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 0, - "shape_quantity": 67, + "shape_denominators": 3, + "shape_quantity": 120, "shape_rank": 0, - "shape": 1123, + "shape": 494, "phase_prune_and_rank": 0, - "bind": 605, - "phase_bind": 123, - "phase_settle": 136, - "phase_place_bindings": 99, + "bind": 463, + "phase_bind": 94, + "phase_settle": 678, + "phase_place_bindings": 23, "phase_facet_requests": 0, - "materialise": 1228, - "phase_materialise": 244, - "answer": 199, - "options": 224, - "phase_outcome": 136 + "materialise": 1045, + "phase_materialise": 191, + "answer": 420, + "options": 173, + "phase_outcome": 121 } }, "restatement": { @@ -630,12 +626,6 @@ ] }, "facets": { - "unit": { - "basis": "fallback", - "ref": "CurrencyUSD", - "label": "US Dollar", - "currency": "USD" - }, "provenance": { "basis": "fallback", "ref": "provenance/OECDCreditorReportingSystem", @@ -650,6 +640,12 @@ }, "documentation": "/api/graph/documentation/provenance/OECDCreditorReportingSystem", "account": "provider" + }, + "unit": { + "basis": "fallback", + "ref": "CurrencyUSD", + "label": "US Dollar", + "currency": "USD" } }, "slot_options": [ @@ -1922,7 +1918,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4100,7 +4096,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [ { @@ -4411,33 +4407,33 @@ } ], "timing_ms": { - "total": 4371, + "total": 3605, "by_step": { - "recall": 625, + "recall": 531, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 5, - "shape_probe": 144, - "shape_groups": 868, - "shape_labels": 14, - "shape_admission": 35, + "shape_arcs": 1, + "shape_probe_coverage": 3, + "shape_probe": 136, + "shape_groups": 80, + "shape_labels": 10, + "shape_admission": 1, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 281, + "shape_quantity": 107, "shape_rank": 0, - "shape": 1394, + "shape": 367, "phase_prune_and_rank": 0, - "bind": 219, - "phase_bind": 141, - "phase_settle": 140, - "phase_place_bindings": 175, + "bind": 611, + "phase_bind": 132, + "phase_settle": 105, + "phase_place_bindings": 45, "phase_facet_requests": 0, - "materialise": 773, - "phase_materialise": 240, - "answer": 32, - "options": 171, - "phase_outcome": 461 + "materialise": 1208, + "phase_materialise": 208, + "answer": 56, + "options": 194, + "phase_outcome": 148 } }, "restatement": { @@ -4969,12 +4965,6 @@ ] }, "facets": { - "unit": { - "basis": "fallback", - "ref": "CurrencyUSD", - "label": "US Dollar", - "currency": "USD" - }, "provenance": { "basis": "fallback", "ref": "provenance/OECDCreditorReportingSystem", @@ -4989,6 +4979,12 @@ }, "documentation": "/api/graph/documentation/provenance/OECDCreditorReportingSystem", "account": "provider" + }, + "unit": { + "basis": "fallback", + "ref": "CurrencyUSD", + "label": "US Dollar", + "currency": "USD" } }, "slot_options": [ @@ -6261,7 +6257,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -8439,7 +8435,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [ { @@ -8750,33 +8746,33 @@ } ], "timing_ms": { - "total": 3123, + "total": 4949, "by_step": { - "recall": 220, + "recall": 1200, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 9, + "shape_arcs": 5, "shape_probe_coverage": 1, - "shape_probe": 68, + "shape_probe": 290, "shape_groups": 134, - "shape_labels": 12, - "shape_admission": 2, + "shape_labels": 10, + "shape_admission": 69, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, - "shape_rank": 7, - "shape": 362, + "shape_denominators": 6, + "shape_quantity": 782, + "shape_rank": 35, + "shape": 1483, "phase_prune_and_rank": 0, - "bind": 138, - "phase_bind": 19, - "phase_settle": 17, - "phase_place_bindings": 989, + "bind": 181, + "phase_bind": 21, + "phase_settle": 15, + "phase_place_bindings": 349, "phase_facet_requests": 0, - "materialise": 205, - "phase_materialise": 20, - "answer": 185, - "options": 93, - "phase_outcome": 875 + "materialise": 181, + "phase_materialise": 61, + "answer": 112, + "options": 96, + "phase_outcome": 1250 } }, "restatement": { @@ -10147,7 +10143,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [ @@ -10656,7 +10652,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [ diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-null-member.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-null-member.json index e79e0e4..38e7a42 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-null-member.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-null-member.json @@ -33,7 +33,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -44,22 +44,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -71,33 +71,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1204,7 +1204,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3356,7 +3356,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -3956,7 +3956,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -4360,7 +4360,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -4721,7 +4721,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "7385994748ff4d0f893c114a8272a43d" + "x-dfo-trace-id": "6ad230a24c054c348d20b568c8e92341" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-partial-nothing-answered.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-partial-nothing-answered.json index 4c448ba..097de54 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-partial-nothing-answered.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-partial-nothing-answered.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -45,22 +45,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -70,11 +70,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", @@ -284,7 +284,7 @@ "error": { "class": "IncompleteAnswerError", "code": "answer_incomplete", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f" + "trace_id": "264af30e460747b4859f987898038f4c" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-artifact-unlisted.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-artifact-unlisted.json index 2562da9..b814755 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-artifact-unlisted.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-artifact-unlisted.json @@ -112,7 +112,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "a392d0bffa3d4c8b8482ace3c72813af" + "x-dfo-trace-id": "3f5785868ff3433bb72c5396385b4e46" }, "json": { "schema_version": 1, @@ -958,7 +958,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "12336630afbc49388f1503fb0756e04b" + "x-dfo-trace-id": "e2c6693baa3d40a1854dba01f191dc89" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-file-selector.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-file-selector.json index 4c6f973..72a1b33 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-file-selector.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-file-selector.json @@ -112,7 +112,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "a392d0bffa3d4c8b8482ace3c72813af" + "x-dfo-trace-id": "3f5785868ff3433bb72c5396385b4e46" }, "json": { "schema_version": 1, @@ -1021,7 +1021,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "12336630afbc49388f1503fb0756e04b" + "x-dfo-trace-id": "e2c6693baa3d40a1854dba01f191dc89" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-newer-version.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-newer-version.json index 753f848..21ff70d 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-newer-version.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-newer-version.json @@ -213,7 +213,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -617,7 +617,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-not-reproducible.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-not-reproducible.json index 0088269..ad58ac1 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-not-reproducible.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-not-reproducible.json @@ -233,7 +233,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1ea967c0fb3c4191b05d37e28f339d57" + "x-dfo-trace-id": "e8d9ece8485f4e1aa8a0e33ca16a4048" }, "json": { "schema_version": 1, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-other-spec.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-other-spec.json index 872419e..fd9bbce 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-other-spec.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-other-spec.json @@ -213,7 +213,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -617,7 +617,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -973,7 +973,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "ec03460d65374d2ebec1d1e36990e273" + "trace_id": "3fd417f4b6de4cbc951d10471c705cd8" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-same-version.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-same-version.json index df962d2..6002682 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-same-version.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-expired-rebuild-same-version.json @@ -213,7 +213,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -617,7 +617,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -977,7 +977,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "7385994748ff4d0f893c114a8272a43d" + "x-dfo-trace-id": "6ad230a24c054c348d20b568c8e92341" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-newest-version.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-newest-version.json index 58f66c2..c00e824 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-newest-version.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-newest-version.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:59:02Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:51:06Z" }, "call": [ { @@ -94,7 +94,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1ea967c0fb3c4191b05d37e28f339d57" + "x-dfo-trace-id": "e8d9ece8485f4e1aa8a0e33ca16a4048" }, "json": { "schema_version": 1, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused-twice.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused-twice.json index 8e0079a..caf1c01 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused-twice.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused-twice.json @@ -112,7 +112,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "a392d0bffa3d4c8b8482ace3c72813af" + "x-dfo-trace-id": "3f5785868ff3433bb72c5396385b4e46" }, "json": { "schema_version": 1, @@ -999,7 +999,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "12336630afbc49388f1503fb0756e04b" + "x-dfo-trace-id": "e2c6693baa3d40a1854dba01f191dc89" } } }, @@ -1025,7 +1025,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "12336630afbc49388f1503fb0756e04b" + "x-dfo-trace-id": "e2c6693baa3d40a1854dba01f191dc89" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused.json index a308655..dc3d161 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-signed-url-refused.json @@ -112,7 +112,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "a392d0bffa3d4c8b8482ace3c72813af" + "x-dfo-trace-id": "3f5785868ff3433bb72c5396385b4e46" }, "json": { "schema_version": 1, @@ -999,7 +999,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "12336630afbc49388f1503fb0756e04b" + "x-dfo-trace-id": "e2c6693baa3d40a1854dba01f191dc89" } } }, @@ -1025,7 +1025,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "12336630afbc49388f1503fb0756e04b" + "x-dfo-trace-id": "e2c6693baa3d40a1854dba01f191dc89" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-unknown-version.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-unknown-version.json index f15c45f..006056d 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-unknown-version.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref-unknown-version.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:52Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:59Z" }, "call": [ { @@ -113,7 +113,7 @@ "status": 404, "headers": { "content-type": "application/problem+json", - "x-dfo-trace-id": "c5e6558a58b44fb8b90acee07819f3d4" + "x-dfo-trace-id": "130bff44f82a479397060e05d28df0ad" }, "json": { "type": "/codes/snapshot_not_found", @@ -121,7 +121,7 @@ "status": 404, "detail": "'spec_774d6c001a6250aa67ca676ab067895e' has no version at content_version 'cv_00000000000000000000000000000000'", "code": "snapshot_not_found", - "trace_id": "c5e6558a58b44fb8b90acee07819f3d4", + "trace_id": "130bff44f82a479397060e05d28df0ad", "capability_version": "dset_af2827aa39ed8c0d", "retryable": false } @@ -133,7 +133,7 @@ "error": { "class": "NotFoundError", "code": "snapshot_not_found", - "trace_id": "c5e6558a58b44fb8b90acee07819f3d4" + "trace_id": "130bff44f82a479397060e05d28df0ad" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref.json index 63a3882..aee0797 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-ref.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:50Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:57Z" }, "call": [ { @@ -113,7 +113,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "a392d0bffa3d4c8b8482ace3c72813af" + "x-dfo-trace-id": "3f5785868ff3433bb72c5396385b4e46" }, "json": { "schema_version": 1, @@ -1000,7 +1000,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "12336630afbc49388f1503fb0756e04b" + "x-dfo-trace-id": "e2c6693baa3d40a1854dba01f191dc89" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-renamed-strict-field.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-renamed-strict-field.json index bc7bfbc..10802fc 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-renamed-strict-field.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-renamed-strict-field.json @@ -33,7 +33,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -44,22 +44,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -71,33 +71,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1204,7 +1204,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3356,7 +3356,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -3956,7 +3956,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -4359,7 +4359,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -4728,7 +4728,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "ec03460d65374d2ebec1d1e36990e273" + "trace_id": "3fd417f4b6de4cbc951d10471c705cd8" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-retry-after-504.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-retry-after-504.json index 6fefacf..57d904c 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-retry-after-504.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-retry-after-504.json @@ -33,7 +33,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -44,22 +44,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -71,33 +71,33 @@ "variable_text": "ODA disbursements for basic health care", "warnings": [], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1204,7 +1204,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3356,7 +3356,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -4057,7 +4057,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -4461,7 +4461,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -4821,7 +4821,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "7385994748ff4d0f893c114a8272a43d" + "x-dfo-trace-id": "6ad230a24c054c348d20b568c8e92341" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-503-then-504.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-503-then-504.json index 676601a..7ec82a1 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-503-then-504.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-503-then-504.json @@ -382,7 +382,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -792,7 +792,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -1136,9 +1136,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-504-retry-after.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-504-retry-after.json index 250718c..6b2c8ad 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-504-retry-after.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-504-retry-after.json @@ -280,7 +280,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -690,7 +690,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -1034,9 +1034,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-accepted-running.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-accepted-running.json index 0a482e4..8e636d4 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-accepted-running.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-accepted-running.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,24 +516,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -530,24 +542,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -556,24 +568,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -582,24 +594,50 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 1693, + "progress": { + "rows_written": 81393, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 1770, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2177, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -608,24 +646,76 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "3", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2780, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 3517, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "5", + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 2273, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 4455, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -634,24 +724,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -689,6 +779,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -864,14 +960,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -893,14 +989,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1001,13 +1097,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1028,13 +1124,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1048,7 +1193,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1056,15 +1201,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1076,32 +1221,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1127,7 +1272,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1381,7 +1526,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1405,7 +1550,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1467,7 +1612,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1476,21 +1621,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1504,20 +1649,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1531,22 +1675,25 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 1.5, 1.5, 1.5, - 1.77, - 2.273 + 1.693, + 2.177, + 2.78, + 3.517, + 4.455 ], "resubmissions": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-async-build.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-async-build.json index 6c64ef5..5ea8634 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-async-build.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-async-build.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,24 +516,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -530,24 +542,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -556,24 +568,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -582,24 +594,50 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 1693, + "progress": { + "rows_written": 81393, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 1770, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2177, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -608,24 +646,76 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "3", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2780, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 3517, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "5", + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 2273, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 4455, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -634,24 +724,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -689,6 +779,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -864,14 +960,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -893,14 +989,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1001,13 +1097,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1028,13 +1124,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1048,7 +1193,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1056,15 +1201,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1076,32 +1221,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1127,7 +1272,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1381,7 +1526,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1405,7 +1550,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1467,7 +1612,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1476,21 +1621,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1504,20 +1649,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1531,22 +1675,25 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 1.5, 1.5, 1.5, - 1.77, - 2.273 + 1.693, + 2.177, + 2.78, + 3.517, + 4.455 ], "resubmissions": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-digest-mismatch.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-digest-mismatch.json index 40bf075..c6e7dca 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-digest-mismatch.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-digest-mismatch.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -930,9 +930,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, @@ -957,9 +957,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-empty-narrowing.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-empty-narrowing.json index 9deab25..c3c7329 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-empty-narrowing.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-empty-narrowing.json @@ -178,7 +178,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -588,7 +588,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -932,9 +932,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-dropped.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-dropped.json index 650a40d..521028e 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-dropped.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-dropped.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:25Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:42Z" }, "call": [ { @@ -183,7 +183,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "3e70bcb5312d4a7fab4a4ec8c4b6b252" + "x-dfo-trace-id": "6d7e0f0640804c578badf7272bc5be35" }, "json": { "schema_version": 1, @@ -588,7 +588,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261020T170016Z-691bf0da", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:25.860383+00:00" + "confirmed_at": "2026-11-15T21:45:44.923352+00:00" }, "warnings": [], "diagnostics": [ @@ -1132,7 +1132,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "9fb2d05ad374410e9249d2a3fcbc8954" + "x-dfo-trace-id": "129cd60e95054dac80c4b9aa59374446" }, "json": { "schema_version": 1, @@ -1141,11 +1141,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "9fb2d05ad374410e9249d2a3fcbc8954", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "129cd60e95054dac80c4b9aa59374446", "warnings": [], "timing_ms": { - "total": 603, + "total": 4, "by_step": { "coverage": 0 } @@ -1160,43 +1160,17 @@ { "code": "role_scope_defaulted", "severity": "warn", - "message": "No provider was named, so the answer covers every provider with data." + "message": "No provider was named, so the answer covers every provider with data.", + "params": { + "axis": "origin" + } } ], "timing_ms": { - "total": 582, + "total": 0, "by_step": { - "validate": 5, - "phase_validate": 0, - "walk": 303, - "reread_arcs": 1, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 65, - "phase_build_shape": 0, - "bind": 1, - "phase_build_bindings": 0, - "where_places": 0, - "phase_where_places": 0, - "materialise": 39, - "phase_materialise": 0, - "ground_related": 12, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 26, - "ground_gates": 3, - "phase_ground_build": 118, - "finalize_preview": 0, - "options": 3, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, - "served_entry": 6 + "response_cache_part_memo": 0, + "served_entry": 0 } }, "entity_refs": [], @@ -2348,7 +2322,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -4937,7 +4911,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ae8092d8c75768ba31abe07fa60d85c1d13f7ed8b2159acb7785e0041f44e771a?X-Goog-Signature=redacted", - "x-dfo-trace-id": "3325fa168a10400ea9c63378125e178e" + "x-dfo-trace-id": "633aabb9b77c4d5580d0d1d063e0093f" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-rebound.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-rebound.json index 65057be..0a54f79 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-rebound.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-entity-rebound.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:23Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:40Z" }, "call": [ { @@ -188,7 +188,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "6acbb3c34a274e87b059f1498576e368" + "x-dfo-trace-id": "db8df711aa78458c83753febb1b60b89" }, "json": { "schema_version": 1, @@ -596,7 +596,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261020T170016Z-691bf0da", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:23.896101+00:00" + "confirmed_at": "2026-11-15T21:45:43.118627+00:00" }, "warnings": [], "diagnostics": [ @@ -1025,7 +1025,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "57f23ea9c8834a7ba7618ec19281f93f" + "x-dfo-trace-id": "25061687ecf24725b732245da6d3122d" }, "json": { "schema_version": 1, @@ -1034,11 +1034,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "57f23ea9c8834a7ba7618ec19281f93f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "25061687ecf24725b732245da6d3122d", "warnings": [], "timing_ms": { - "total": 198, + "total": 5, "by_step": { "coverage": 0 } @@ -1051,38 +1051,9 @@ "variable_text": "dataset", "warnings": [], "timing_ms": { - "total": 184, + "total": 0, "by_step": { - "validate": 5, - "phase_validate": 0, - "walk": 1, - "reread_arcs": 1, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 66, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 0, - "phase_where_places": 0, - "materialise": 23, - "phase_materialise": 0, - "ground_related": 0, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 22, - "ground_gates": 2, - "phase_ground_build": 54, - "finalize_preview": 0, - "options": 10, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, + "response_cache_part_memo": 0, "served_entry": 0 } }, @@ -2108,7 +2079,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -4627,7 +4598,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A13a775f3b4811a104717ac226f173d614d685e533def09482b83c55e06505c4c?X-Goog-Signature=redacted", - "x-dfo-trace-id": "9b5af55980344853a311bd74eff50bc3" + "x-dfo-trace-id": "f44e81cfeb6b4fb2a50d3136ceab5bf2" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-no-content.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-no-content.json index 3e2d2a7..863e377 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-no-content.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-no-content.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -930,7 +930,7 @@ "response": { "status": 204, "headers": { - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } } @@ -940,7 +940,7 @@ "error": { "class": "ContractError", "code": "unexpected_response", - "trace_id": "b1f3b19366b34e68aebd3dd7c4318d47" + "trace_id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-serves-file.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-serves-file.json index c868fa0..ee1e78b 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-serves-file.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-serves-file.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -931,7 +931,7 @@ "status": 200, "headers": { "content-type": "application/vnd.apache.parquet", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" }, "body_file": "fetch-spec-known-sentence.parquet" } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-temporary-redirect.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-temporary-redirect.json index b361317..fa65fec 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-temporary-redirect.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-files-route-temporary-redirect.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -931,7 +931,7 @@ "status": 307, "headers": { "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } } @@ -941,7 +941,7 @@ "error": { "class": "ContractError", "code": "unexpected_response", - "trace_id": "b1f3b19366b34e68aebd3dd7c4318d47" + "trace_id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-foreign-artifact-url.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-foreign-artifact-url.json index 50fe712..6948c00 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-foreign-artifact-url.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-foreign-artifact-url.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -928,7 +928,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1452d918e67c4b499833f81cc67a1350" + "trace_id": "c65f0cb980af42f48295577fcb536d34" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-frame-layout.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-frame-layout.json index bcac516..6c4e672 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-frame-layout.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-frame-layout.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:17Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:45Z" }, "call": [ { @@ -175,7 +175,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "5603eb390a964db9ab3bcba8cd79bce6" + "x-dfo-trace-id": "4f5c69ed91984ec18d73161eb9c14769" }, "json": { "schema_version": 1, @@ -579,7 +579,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -938,7 +938,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Af4026e80af4b8683d3bb86645ab3aca83dff75cd03fdd4c73ec54ba638922104?X-Goog-Signature=redacted", - "x-dfo-trace-id": "62351270c21e4563897603acf4f46f79" + "x-dfo-trace-id": "687d4eede9ba4d77b7e20a8925a58fbd" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.json index 66b5435..5096246 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.json @@ -5,17 +5,17 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:41Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:50Z" }, "call": [ { "op": "fetch", "spec": { - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "definition": { "schema_version": 1, - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "identity": { "identity_version": "spec1", "shape": { @@ -107,10 +107,16 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Germany's net disbursements to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Germany's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "Least Developed Countries", @@ -133,10 +139,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "definition": { "schema_version": 1, - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "identity": { "identity_version": "spec1", "shape": { @@ -228,6 +234,12 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -250,13 +262,13 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "19fb69af36564ebb8528086c6944614f" + "x-dfo-trace-id": "891e665fa212451fa4efc9973380f05a" }, "json": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_53102a787c202df65dcbb4d112c7bf33", + "spec_id": "spec_0cbc2682d8858844f8b1b14a96415b09", "identity": { "shape": { "kind": "statvar_schema", @@ -294,6 +306,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/DEU" @@ -353,8 +371,8 @@ } } }, - "content_version": "cv_c836c8b3ecbb63dde4177d8c5e23c9e3", - "prepared_at": "2026-11-01T07:38:21Z", + "content_version": "cv_bb74b3683595b00ac708fc3a5250c406", + "prepared_at": "2026-11-15T21:46:05Z", "coverage": { "rows": 170, "dimensions": [ @@ -486,13 +504,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -513,17 +531,68 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 170, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 2020, + 2023 + ] + ], + "warnings": [ + "coverage_below_scope" + ], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_c836c8b3ecbb63dde4177d8c5e23c9e3" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2023, "start_year": 2020 }, - "graph_revision": "dfo-dev-dc-datacommons-service-00284-j2f", + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { - "exported_at": "2026-11-01T03:08:18Z", - "content_hash": "a1bde3be8710f5ba073e52aaaba73cf9156079c273c874372f54bb07a81b0f94", + "exported_at": "2026-11-12T22:30:30Z", + "content_hash": "68c74212b6a5f923d3543f7bb04f7b791c28b62bfccd3d073ab03bfcb50216da", "graph_endpoint": "graph_release" }, "source_revisions": [ @@ -532,8 +601,8 @@ "revision": "2026-10-29" } ], - "capability_version": "dset_5282a0674178a233", - "materialiser_build": "ccb6617922c839ce3cd5615a3bbb65c70bfe1bde", + "capability_version": "dset_af2827aa39ed8c0d", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -544,18 +613,18 @@ "observation_count": 170 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", - "frame_grammar_version": "1.1.0", - "origin_catalogue_build_id": "20261029T171521Z-7d0a5854", + "family_member_count": null, + "family_member_digest": null, + "frame_grammar_version": "1.2.0", + "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:44.975846+00:00" + "confirmed_at": "2026-11-15T21:46:05.204630+00:00" }, "warnings": [ { "code": "coverage_below_scope", "severity": "warn", - "message": "The served coverage falls short of the requested scope. No observations were served for 1 requested entity.", + "message": "The served coverage falls short of the requested scope. No observations were served for 1 requested entity. Of these, the bilateral component leaves out 1.", "unserved_entities": { "count": 1, "refs": [ @@ -573,30 +642,30 @@ ], "artifacts": [ { - "artifact_digest": "sha256:dfab152c9d79c0c3c7c1269ee875140a2afeac20859331d30f2931c819d80fc2", + "artifact_digest": "sha256:3565b8b17ab22c1a5074c3e4a22ff3523024c4d94b558643d3b5fa14b81bfa5c", "rendering": { "bundle": false, "format": "parquet", "layout": 4, "without_party_totals": true }, - "bytes": 8800, + "bytes": 8701, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-01T07:38:21.430053+00:00", + "created_at": "2026-11-15T21:46:05.154787+00:00", "tier": "working", - "url": "/api/datasets/spec_53102a787c202df65dcbb4d112c7bf33/cv_c836c8b3ecbb63dde4177d8c5e23c9e3/files/sha256:dfab152c9d79c0c3c7c1269ee875140a2afeac20859331d30f2931c819d80fc2", + "url": "/api/datasets/spec_0cbc2682d8858844f8b1b14a96415b09/cv_bb74b3683595b00ac708fc3a5250c406/files/sha256:3565b8b17ab22c1a5074c3e4a22ff3523024c4d94b558643d3b5fa14b81bfa5c", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:c959529fa024aa5d9129d7d666cd9d4a63bef22171eb97097270df2d2d814cad", + "artifact_digest": "sha256:654644a9b2a9dfd1f2dd7f0ced991ff8e5d6581df744cc06e84c637e0af34bc0", "rendering": { "statistics": "series" }, - "bytes": 7752, + "bytes": 7794, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-01T07:38:21.430053+00:00", + "created_at": "2026-11-15T21:46:05.154787+00:00", "tier": "working", - "url": "/api/datasets/spec_53102a787c202df65dcbb4d112c7bf33/cv_c836c8b3ecbb63dde4177d8c5e23c9e3/files/sha256:c959529fa024aa5d9129d7d666cd9d4a63bef22171eb97097270df2d2d814cad" + "url": "/api/datasets/spec_0cbc2682d8858844f8b1b14a96415b09/cv_bb74b3683595b00ac708fc3a5250c406/files/sha256:654644a9b2a9dfd1f2dd7f0ced991ff8e5d6581df744cc06e84c637e0af34bc0" } ], "series_count": 43, @@ -907,7 +976,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-01T07:38:21.430340Z" + "held_until": "2026-12-15T21:46:05.155827Z" } } } @@ -961,6 +1030,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/DEU" @@ -1034,7 +1109,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "5353fb064a784841b27a7c78dba78c7a" + "x-dfo-trace-id": "5c454a6886c14ddc8d50586a47fdfdd4" }, "json": { "schema_version": 1, @@ -1043,11 +1118,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "5353fb064a784841b27a7c78dba78c7a", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "5c454a6886c14ddc8d50586a47fdfdd4", "warnings": [], "timing_ms": { - "total": 153, + "total": 5, "by_step": { "coverage": 0 } @@ -1060,39 +1135,11 @@ "variable_text": "dataset", "warnings": [], "timing_ms": { - "total": 140, + "total": 0, "by_step": { - "validate": 1, - "phase_validate": 0, - "walk": 15, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 1, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 33, - "phase_materialise": 0, - "ground_related": 1, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 17, - "ground_gates": 5, - "phase_ground_build": 61, - "finalize_preview": 0, - "options": 3, - "finalize_related": 0, - "finalize_wholes": 1, - "finalize_relaunch": 0, - "phase_finalize": 1, - "served_entry": 0 + "response_cache_part_memo": 0, + "served_entry": 0, + "as_composite": 0 } }, "entity_refs": [], @@ -1100,8 +1147,8 @@ "departures": [ { "code": "closest_match", - "shown": "net disbursements", - "text": "This shows net disbursements, the closest measure the data holds." + "shown": "net disbursements (bilateral flows)", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds." }, { "code": "entity_unavailable", @@ -1117,10 +1164,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_53102a787c202df65dcbb4d112c7bf33", + "spec_id": "spec_0cbc2682d8858844f8b1b14a96415b09", "definition": { "schema_version": 1, - "spec_id": "spec_53102a787c202df65dcbb4d112c7bf33", + "spec_id": "spec_0cbc2682d8858844f8b1b14a96415b09", "identity": { "identity_version": "spec1", "shape": { @@ -1214,6 +1261,12 @@ "kind": "range", "start_year": 2020, "end_year": 2023 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -1728,6 +1781,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2020", "end": "2023" @@ -2107,20 +2161,6 @@ "has_data": true, "observation_count": 170, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 4 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2020, "end_year": 2023 @@ -2171,7 +2211,7 @@ }, "download": { "rows": 170, - "rows_exact": true, + "rows_exact": false, "series": 43, "window": { "start_year": 2020, @@ -2184,9 +2224,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -2195,7 +2235,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -2296,7 +2335,7 @@ "source": "observed" } ], - "rendered_sentence": "Germany's net disbursements to the 44 Least Developed Countries for official development assistance, 2020 to 2023. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 2020 to 2023. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -2327,7 +2366,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -2996,7 +3035,7 @@ "start_year": 2020, "end_year": 2023 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -3144,7 +3183,7 @@ "served_rows_exact": true } ], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -5158,7 +5197,7 @@ } } ], - "rendered_sentence": "Germany's net disbursements to the 44 Least Developed Countries for official development assistance, 2020 to 2023. Current US dollars · OECD DAC2a. This shows net disbursements, the closest measure the data holds. The data holds no values for 1 of the 44 Least Developed Countries. This shows the 44 Least Developed Countries, each on its own.", + "rendered_sentence": "Germany's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 2020 to 2023. Current US dollars · OECD DAC2a. This shows net disbursements (bilateral flows), the closest measure the data holds. The data holds no values for 1 of the 44 Least Developed Countries. This shows the 44 Least Developed Countries, each on its own.", "sentence_plan": [ { "kind": "slot", @@ -5192,7 +5231,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -5402,7 +5441,7 @@ }, { "kind": "text", - "text": "This shows net disbursements, the closest measure the data holds.", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds.", "segment": "departure", "entity_refs": [], "states": [], @@ -5448,21 +5487,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_53102a787c202df65dcbb4d112c7bf33/cv_c836c8b3ecbb63dde4177d8c5e23c9e3/files/sha256:dfab152c9d79c0c3c7c1269ee875140a2afeac20859331d30f2931c819d80fc2" + "origin_path": "/api/datasets/spec_0cbc2682d8858844f8b1b14a96415b09/cv_bb74b3683595b00ac708fc3a5250c406/files/sha256:3565b8b17ab22c1a5074c3e4a22ff3523024c4d94b558643d3b5fa14b81bfa5c" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Adfab152c9d79c0c3c7c1269ee875140a2afeac20859331d30f2931c819d80fc2?X-Goog-Signature=redacted", - "x-dfo-trace-id": "fee39f0b86fb4dc5a7b8e7efd2f451f9" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A3565b8b17ab22c1a5074c3e4a22ff3523024c4d94b558643d3b5fa14b81bfa5c?X-Goog-Signature=redacted", + "x-dfo-trace-id": "5c6d7069914f4efaa12bec354a84652f" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Adfab152c9d79c0c3c7c1269ee875140a2afeac20859331d30f2931c819d80fc2?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A3565b8b17ab22c1a5074c3e4a22ff3523024c4d94b558643d3b5fa14b81bfa5c?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -5483,13 +5522,12 @@ "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingRecipient", + "stat_var_label", "financingProvider", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -5503,9 +5541,9 @@ "members": [ { "parts": [], - "spec_id": "spec_53102a787c202df65dcbb4d112c7bf33", - "content_version": "cv_c836c8b3ecbb63dde4177d8c5e23c9e3", - "sentence": "Germany's net disbursements to the 44 Least Developed Countries for official development assistance, 2020 to 2023. Current US dollars · OECD DAC2a." + "spec_id": "spec_0cbc2682d8858844f8b1b14a96415b09", + "content_version": "cv_bb74b3683595b00ac708fc3a5250c406", + "sentence": "Germany's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 2020 to 2023. Current US dollars · OECD DAC2a." } ], "missing": [] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.parquet b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.parquet index 71f23dc..83e4f90 100644 Binary files a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.parquet and b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-narrowed.parquet differ diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.json index 2402f37..4f95760 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.json @@ -5,17 +5,17 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:46Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:53Z" }, "call": [ { "op": "fetch", "spec": { - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "definition": { "schema_version": 1, - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "identity": { "identity_version": "spec1", "shape": { @@ -107,10 +107,16 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Germany's net disbursements to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Germany's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "Least Developed Countries", @@ -134,10 +140,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "definition": { "schema_version": 1, - "spec_id": "spec_fc5ce33e120fc3dcba5e02f0655a4258", + "spec_id": "spec_e08f40c36e984153d484b17eff67f258", "identity": { "identity_version": "spec1", "shape": { @@ -229,6 +235,12 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -297,13 +309,13 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "87ea1a1176844cbeb2aea4382693f3ed" + "x-dfo-trace-id": "0d416565ad4642758da83890e2b62015" }, "json": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_d0fa2dd4c5ba67436b13a12bb98547d4", + "spec_id": "spec_a1a4dd1696bf239aed0d96085f9bd5be", "identity": { "shape": { "kind": "statvar_schema", @@ -341,6 +353,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/FRA" @@ -398,8 +416,8 @@ } } }, - "content_version": "cv_070d2755d6bf2ffa39860ca05c717279", - "prepared_at": "2026-11-01T07:38:23Z", + "content_version": "cv_826835ff0b086fed3fef5ae63099baf1", + "prepared_at": "2026-11-15T21:46:07Z", "coverage": { "rows": 2128, "dimensions": [ @@ -531,13 +549,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -558,17 +576,70 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 2128, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1960, + 1960 + ], + [ + 1963, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_070d2755d6bf2ffa39860ca05c717279" + } + ], "applied_window": { "kind": "all", "origin": "default", "end_year": 2024, "start_year": 1960 }, - "graph_revision": "dfo-dev-dc-datacommons-service-00284-j2f", + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { - "exported_at": "2026-11-01T03:08:18Z", - "content_hash": "a1bde3be8710f5ba073e52aaaba73cf9156079c273c874372f54bb07a81b0f94", + "exported_at": "2026-11-12T22:30:30Z", + "content_hash": "68c74212b6a5f923d3543f7bb04f7b791c28b62bfccd3d073ab03bfcb50216da", "graph_endpoint": "graph_release" }, "source_revisions": [ @@ -577,8 +648,8 @@ "revision": "2026-10-29" } ], - "capability_version": "dset_5282a0674178a233", - "materialiser_build": "ccb6617922c839ce3cd5615a3bbb65c70bfe1bde", + "capability_version": "dset_af2827aa39ed8c0d", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -589,12 +660,12 @@ "observation_count": 2128 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", - "frame_grammar_version": "1.1.0", - "origin_catalogue_build_id": "20261029T171521Z-7d0a5854", + "family_member_count": null, + "family_member_digest": null, + "frame_grammar_version": "1.2.0", + "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:46.731426+00:00" + "confirmed_at": "2026-11-15T21:46:08.013601+00:00" }, "warnings": [], "diagnostics": [ @@ -606,30 +677,30 @@ ], "artifacts": [ { - "artifact_digest": "sha256:e394e0de88d7c5b0e9488b0169a229b2261005a5ab2d7b9a4d8e2dd925da5fa1", + "artifact_digest": "sha256:6a80576ffe7ac1009b8536c324a42fc8ab4a1be448036841821107fedae3c852", "rendering": { "bundle": false, "format": "parquet", "layout": 4, "without_party_totals": true }, - "bytes": 21244, + "bytes": 21143, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-01T07:38:23.639888+00:00", + "created_at": "2026-11-15T21:46:07.963084+00:00", "tier": "working", - "url": "/api/datasets/spec_d0fa2dd4c5ba67436b13a12bb98547d4/cv_070d2755d6bf2ffa39860ca05c717279/files/sha256:e394e0de88d7c5b0e9488b0169a229b2261005a5ab2d7b9a4d8e2dd925da5fa1", + "url": "/api/datasets/spec_a1a4dd1696bf239aed0d96085f9bd5be/cv_826835ff0b086fed3fef5ae63099baf1/files/sha256:6a80576ffe7ac1009b8536c324a42fc8ab4a1be448036841821107fedae3c852", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:2b399bedb12605f62e1688725984e5969e06abf9265bfa19e7bb7febdc50d989", + "artifact_digest": "sha256:9c5838210b7c2122b3d1de68e8d60991fc6c481097997b8ef3ea7c81635d69d7", "rendering": { "statistics": "series" }, - "bytes": 8128, + "bytes": 8170, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-01T07:38:23.639888+00:00", + "created_at": "2026-11-15T21:46:07.963084+00:00", "tier": "working", - "url": "/api/datasets/spec_d0fa2dd4c5ba67436b13a12bb98547d4/cv_070d2755d6bf2ffa39860ca05c717279/files/sha256:2b399bedb12605f62e1688725984e5969e06abf9265bfa19e7bb7febdc50d989" + "url": "/api/datasets/spec_a1a4dd1696bf239aed0d96085f9bd5be/cv_826835ff0b086fed3fef5ae63099baf1/files/sha256:9c5838210b7c2122b3d1de68e8d60991fc6c481097997b8ef3ea7c81635d69d7" } ], "series_count": 44, @@ -940,7 +1011,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-01T07:38:23.640348Z" + "held_until": "2026-12-15T21:46:07.963810Z" } } } @@ -994,6 +1065,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/FRA" @@ -1065,7 +1142,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "db5036d029c443f9a8827d6ad70573c6" + "x-dfo-trace-id": "120676f57ea84928b91783e370e3bba7" }, "json": { "schema_version": 1, @@ -1074,11 +1151,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "db5036d029c443f9a8827d6ad70573c6", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "120676f57ea84928b91783e370e3bba7", "warnings": [], "timing_ms": { - "total": 114, + "total": 5, "by_step": { "coverage": 0 } @@ -1091,39 +1168,11 @@ "variable_text": "dataset", "warnings": [], "timing_ms": { - "total": 100, + "total": 0, "by_step": { - "validate": 1, - "phase_validate": 0, - "walk": 0, - "reread_arcs": 1, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 0, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 1, - "phase_where_places": 0, - "materialise": 24, - "phase_materialise": 0, - "ground_related": 0, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 12, - "ground_gates": 3, - "phase_ground_build": 54, - "finalize_preview": 0, - "options": 3, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, - "served_entry": 1 + "response_cache_part_memo": 0, + "served_entry": 0, + "as_composite": 0 } }, "entity_refs": [], @@ -1131,8 +1180,8 @@ "departures": [ { "code": "closest_match", - "shown": "net disbursements", - "text": "This shows net disbursements, the closest measure the data holds." + "shown": "net disbursements (bilateral flows)", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds." }, { "code": "group_read_as_members", @@ -1143,10 +1192,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_d0fa2dd4c5ba67436b13a12bb98547d4", + "spec_id": "spec_a1a4dd1696bf239aed0d96085f9bd5be", "definition": { "schema_version": 1, - "spec_id": "spec_d0fa2dd4c5ba67436b13a12bb98547d4", + "spec_id": "spec_a1a4dd1696bf239aed0d96085f9bd5be", "identity": { "identity_version": "spec1", "shape": { @@ -1238,6 +1287,12 @@ }, "requested_window": { "kind": "all" + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -1722,7 +1777,14 @@ "label": "time window" }, "binding": { - "kind": "unbound" + "kind": "value", + "value": { + "value_kind": "time_window", + "time_window": { + "start_year": 1960, + "end_year": 2024 + } + } }, "summable": false }, @@ -1745,6 +1807,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "1960", "end": "2024" @@ -2124,20 +2187,10 @@ "has_data": true, "observation_count": 2128, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 61 - }, - { - "label": "variables", - "count": 1 - } - ] + "window": { + "start_year": 1960, + "end_year": 2024 + } }, "headline": { "year": 2024, @@ -2180,7 +2233,7 @@ }, "download": { "rows": 2128, - "rows_exact": true, + "rows_exact": false, "series": 44, "window": { "start_year": 1960, @@ -2193,9 +2246,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -2204,7 +2257,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -2332,7 +2384,7 @@ "source": "observed" } ], - "rendered_sentence": "France's net disbursements to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", + "rendered_sentence": "France's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", @@ -2363,7 +2415,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3028,7 +3080,7 @@ } ], "query_qualifiers": [], - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -3174,7 +3226,7 @@ "served_rows_exact": true } ], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -5194,7 +5246,7 @@ } } ], - "rendered_sentence": "France's net disbursements to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a. This shows net disbursements, the closest measure the data holds. This shows the 44 Least Developed Countries, each on its own.", + "rendered_sentence": "France's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a. This shows net disbursements (bilateral flows), the closest measure the data holds. This shows the 44 Least Developed Countries, each on its own.", "sentence_plan": [ { "kind": "slot", @@ -5228,7 +5280,7 @@ }, { "kind": "slot", - "text": "net disbursements", + "text": "net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -5438,7 +5490,7 @@ }, { "kind": "text", - "text": "This shows net disbursements, the closest measure the data holds.", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds.", "segment": "departure", "entity_refs": [], "states": [], @@ -5468,21 +5520,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_d0fa2dd4c5ba67436b13a12bb98547d4/cv_070d2755d6bf2ffa39860ca05c717279/files/sha256:e394e0de88d7c5b0e9488b0169a229b2261005a5ab2d7b9a4d8e2dd925da5fa1" + "origin_path": "/api/datasets/spec_a1a4dd1696bf239aed0d96085f9bd5be/cv_826835ff0b086fed3fef5ae63099baf1/files/sha256:6a80576ffe7ac1009b8536c324a42fc8ab4a1be448036841821107fedae3c852" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ae394e0de88d7c5b0e9488b0169a229b2261005a5ab2d7b9a4d8e2dd925da5fa1?X-Goog-Signature=redacted", - "x-dfo-trace-id": "899f7674e1b24d6f8d34766334dbcdd9" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A6a80576ffe7ac1009b8536c324a42fc8ab4a1be448036841821107fedae3c852?X-Goog-Signature=redacted", + "x-dfo-trace-id": "84c095a8d1514063bfa2056b658aa28c" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ae394e0de88d7c5b0e9488b0169a229b2261005a5ab2d7b9a4d8e2dd925da5fa1?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A6a80576ffe7ac1009b8536c324a42fc8ab4a1be448036841821107fedae3c852?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -5503,13 +5555,12 @@ "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingRecipient", + "stat_var_label", "financingProvider", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -5523,9 +5574,9 @@ "members": [ { "parts": [], - "spec_id": "spec_d0fa2dd4c5ba67436b13a12bb98547d4", - "content_version": "cv_070d2755d6bf2ffa39860ca05c717279", - "sentence": "France's net disbursements to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_a1a4dd1696bf239aed0d96085f9bd5be", + "content_version": "cv_826835ff0b086fed3fef5ae63099baf1", + "sentence": "France's net disbursements (bilateral flows) to the 44 Least Developed Countries for official development assistance, 1960 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.parquet b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.parquet index c7afe73..1495bef 100644 Binary files a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.parquet and b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-group-origin-rebound.parquet differ diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-known-sentence.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-known-sentence.json index 2291231..4dbf15c 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-known-sentence.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-known-sentence.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:48Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:54Z" }, "call": [ { @@ -177,7 +177,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -587,7 +587,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -931,9 +931,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-identity.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-identity.json index f2e505e..f2452e4 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-identity.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-identity.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -521,7 +521,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -863,7 +863,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1452d918e67c4b499833f81cc67a1350" + "trace_id": "c65f0cb980af42f48295577fcb536d34" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-schema-version.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-schema-version.json index 5d89d11..3d79613 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-schema-version.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-manifest-without-schema-version.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -585,7 +585,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -927,7 +927,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1452d918e67c4b499833f81cc67a1350" + "trace_id": "c65f0cb980af42f48295577fcb536d34" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-narrowed.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-narrowed.json index 7724930..62fcaee 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-narrowed.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-narrowed.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:19Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:37Z" }, "call": [ { @@ -184,7 +184,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "0ae759aa6d0f43958e209452cbb5cbe4" + "x-dfo-trace-id": "7da584d97aab41afad0f21d975cfc83a" }, "json": { "schema_version": 1, @@ -594,7 +594,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -1016,7 +1016,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "d60b8b5872ea42c8b2ebcabbb88bc48e" + "x-dfo-trace-id": "36be7857339d47a7bab0b6a7379ed66a" }, "json": { "schema_version": 1, @@ -1025,11 +1025,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "d60b8b5872ea42c8b2ebcabbb88bc48e", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "36be7857339d47a7bab0b6a7379ed66a", "warnings": [], "timing_ms": { - "total": 492, + "total": 4, "by_step": { "coverage": 0 } @@ -1042,38 +1042,9 @@ "variable_text": "dataset", "warnings": [], "timing_ms": { - "total": 476, + "total": 1, "by_step": { - "validate": 5, - "phase_validate": 0, - "walk": 298, - "reread_arcs": 1, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 65, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 0, - "phase_where_places": 0, - "materialise": 19, - "phase_materialise": 0, - "ground_related": 1, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 22, - "ground_gates": 12, - "phase_ground_build": 51, - "finalize_preview": 0, - "options": 2, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, + "response_cache_part_memo": 1, "served_entry": 0 } }, @@ -2084,7 +2055,7 @@ "start_year": 2020, "end_year": 2023 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -4602,7 +4573,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "53d0784f49f24fe6852ec061e2aa9825" + "x-dfo-trace-id": "7356233c977d4568a3957ae5d4a26e82" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-operation-failed-resubmitted.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-operation-failed-resubmitted.json index bfe2d27..358b079 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-operation-failed-resubmitted.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-operation-failed-resubmitted.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,20 +516,20 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "failed", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 }, "error": { @@ -541,10 +553,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -756,8 +768,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -772,15 +790,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -789,24 +807,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -815,24 +833,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -841,24 +859,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -867,24 +885,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 1770, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 1693, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 81393, + "estimate_rows": 103020 } } } @@ -893,24 +911,76 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "3", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2177, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2780, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 2273, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 3517, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -919,24 +989,50 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "retry-after": "5", + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 4455, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -974,6 +1070,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -1149,14 +1251,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -1178,14 +1280,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1286,13 +1388,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1313,13 +1415,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1333,7 +1484,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1341,15 +1492,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1361,32 +1512,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1412,7 +1563,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1666,7 +1817,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1690,7 +1841,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1752,7 +1903,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1761,21 +1912,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1789,20 +1940,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1816,23 +1966,26 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 1.5, 1.5, 1.5, 1.5, - 1.77, - 2.273 + 1.693, + 2.177, + 2.78, + 3.517, + 4.455 ], "resubmissions": 1 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.json index 272b4fd..c2bbc98 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.json @@ -5,17 +5,17 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:38Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:47Z" }, "call": [ { "op": "fetch", "spec": { - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "definition": { "schema_version": 1, - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "identity": { "identity_version": "spec1", "shape": { @@ -229,10 +229,16 @@ "kind": "range", "start_year": 1967, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1967 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1967 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -267,10 +273,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "definition": { "schema_version": 1, - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "identity": { "identity_version": "spec1", "shape": { @@ -484,6 +490,12 @@ "kind": "range", "start_year": 1967, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -510,13 +522,13 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "caa52cb7545a4a078d3c07b23e9b19b1" + "x-dfo-trace-id": "499aacc561b545da926969b907a8491b" }, "json": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "identity": { "shape": { "kind": "statvar_schema", @@ -554,6 +566,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "destination": [ "country/KEN" @@ -567,8 +585,8 @@ } } }, - "content_version": "cv_574e68a18917407b0f5534cfc9ff001b", - "prepared_at": "2026-10-15T09:59:06Z", + "content_version": "cv_6405444d04fda3b7ee8eb651528ab410", + "prepared_at": "2026-11-15T21:45:53Z", "coverage": { "rows": 111, "dimensions": [ @@ -626,7 +644,7 @@ "source_data_url": "https://webfs-dcd.oecd.org/files/dotStat/DSD_DAC2/Table2a_Data.zip", "attribution": "OECD (2026), OECD DAC2A, OECD Data Explorer, https://webfs-dcd.oecd.org/files/dotStat/DSD_DAC2/Table2a_Data.zip (accessed on 2026-10-12)", "update_cadence": "Quarterly", - "last_update": "2026-10-12", + "last_update": "2026-10-29", "years_covered": "1960-2025", "granularity": "Annual, by provider and recipient", "currencies": [ @@ -637,6 +655,10 @@ "transformation": "Download the source data", "description": "The OECD publishes DAC2A in April, June, September and December. The complete table is downloaded from the OECD each time it is republished, and replaces the previous copy, so the data reflects the OECD's latest release." }, + { + "transformation": "Mark the partial year", + "description": "The OECD publishes data for a year as donors report it, and its final release in December of the following year covers every donor. Until then, the year is partial. The pipeline publishes it, and the import's provenance names it in `partialObservationDate`." + }, { "transformation": "Standardise providers and recipients", "description": "Provider and recipient codes are standardised to Data Commons IDs used across the platform, so data can be compared across datasets. The totals DAC2A reports for groups of providers, such as all DAC countries, and for groups of recipients, such as regions and income groups, are included as providers and recipients of their own. Where two provider codes name the same organisation and report the same figures, the figures are counted once. Where two recipient codes name the same organisation, such as IDA and IDA's Multilateral Debt Relief Initiative, their flows are added." @@ -655,6 +677,26 @@ } ], "version_history": [ + { + "date": "2026-10-29", + "title": "Partial year published, marked as partial", + "changes": [ + { + "kind": "changed", + "note": "The partial year, which only some donors have reported ahead of the OECD's final release in December, is included, and the import's provenance marks it with `partialObservationDate`." + } + ] + }, + { + "date": "2026-10-15", + "title": "Partial year excluded", + "changes": [ + { + "kind": "changed", + "note": "The partial year, which only some donors have reported ahead of the OECD's final release in December, is excluded." + } + ] + }, { "date": "2026-10-14", "title": "First release", @@ -676,13 +718,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -703,27 +745,76 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 111, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 2022, + 2022 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_574e68a18917407b0f5534cfc9ff001b" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2022, "start_year": 2022 }, - "graph_revision": "dfo-dev-dc-datacommons-service-00249-9gv", + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { - "exported_at": "2026-10-13T21:51:17Z", - "content_hash": "602c7022fc21c17540a6873d93196ad6b967eaae3e71f9dce6dec178a735daf4", - "graph_endpoint": "https://dfo-dev-dc-datacommons-service-zms5lj4zhq-nn.a.run.app" + "exported_at": "2026-11-12T22:30:30Z", + "content_hash": "68c74212b6a5f923d3543f7bb04f7b791c28b62bfccd3d073ab03bfcb50216da", + "graph_endpoint": "graph_release" }, "source_revisions": [ { "source": "provenance/OECDDAC2A", - "revision": "2026-10-12" + "revision": "2026-10-29" } ], - "capability_version": "dset_1e6cd9546fac19e9", - "materialiser_build": "1d29a70e59f70570c5ed8d610ec83291c8eb6f54", + "capability_version": "dset_af2827aa39ed8c0d", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -734,12 +825,12 @@ "observation_count": 111 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", - "frame_grammar_version": "1.1.0", - "origin_catalogue_build_id": "20261013T114555Z-613cf5c2", + "family_member_count": null, + "family_member_digest": null, + "frame_grammar_version": "1.2.0", + "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:34.704617+00:00" + "confirmed_at": "2026-11-15T21:45:54.172725+00:00" }, "warnings": [], "diagnostics": [ @@ -751,18 +842,29 @@ ], "artifacts": [ { - "artifact_digest": "sha256:7ef1038eb25d978077bb4f5b9c54e940052ccd2aedd3284e6fb9739f1deca1f4", + "artifact_digest": "sha256:bff41f3d3d6707d06d4de9224994ad02cff5bb4cf219c3d8e7b8c96244ca81f9", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 10911, + "bytes": 10784, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-01T07:38:12.547249+00:00", + "created_at": "2026-11-15T21:45:55.944587+00:00", "tier": "working", - "url": "/api/datasets/spec_e14699f9dcd167f0211081a726ae1031/cv_574e68a18917407b0f5534cfc9ff001b/files/sha256:7ef1038eb25d978077bb4f5b9c54e940052ccd2aedd3284e6fb9739f1deca1f4", + "url": "/api/datasets/spec_c9f9d816838bf8da08a3de2849783273/cv_6405444d04fda3b7ee8eb651528ab410/files/sha256:bff41f3d3d6707d06d4de9224994ad02cff5bb4cf219c3d8e7b8c96244ca81f9", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" + }, + { + "artifact_digest": "sha256:b804bc326713f6f02aeaee39695cb27487ed37a3c0f18b281f22579eb2fa6556", + "rendering": { + "statistics": "series" + }, + "bytes": 10101, + "media_type": "application/vnd.apache.parquet", + "created_at": "2026-11-15T21:45:54.092554+00:00", + "tier": "working", + "url": "/api/datasets/spec_c9f9d816838bf8da08a3de2849783273/cv_6405444d04fda3b7ee8eb651528ab410/files/sha256:b804bc326713f6f02aeaee39695cb27487ed37a3c0f18b281f22579eb2fa6556" } ], "series_count": 111, @@ -1135,7 +1237,8 @@ }, "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { - "pinned": true + "pinned": false, + "held_until": "2026-12-15T21:45:54.093291Z" } } } @@ -1189,6 +1292,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "destination": [ "country/KEN" @@ -1210,7 +1319,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "641b256c0cd04d30a7f3c3784b20fd61" + "x-dfo-trace-id": "887076dadfe5407d814246fbefc1a3c0" }, "json": { "schema_version": 1, @@ -1219,8 +1328,8 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "641b256c0cd04d30a7f3c3784b20fd61", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "887076dadfe5407d814246fbefc1a3c0", "warnings": [], "timing_ms": { "total": 5, @@ -1238,13 +1347,16 @@ { "code": "role_scope_defaulted", "severity": "warn", - "message": "No provider was named, so the answer covers every provider with data." + "message": "No provider was named, so the answer covers all 96 providers with data to Kenya.", + "params": { + "axis": "origin" + } }, { "code": "whole_total_available", "severity": "info", "message": "The source publishes the total of every official donor as official donors (DAC); a sum of the listed donors includes private donors and differs from it.", - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "params": { "total": "DACOfficialDonors", "total_label": "official donors (DAC)", @@ -1256,7 +1368,8 @@ "total": 1, "by_step": { "response_cache_part_memo": 0, - "served_entry": 1 + "served_entry": 0, + "as_composite": 1 } }, "entity_refs": [], @@ -1264,8 +1377,8 @@ "departures": [ { "code": "closest_match", - "shown": "net disbursements", - "text": "This shows net disbursements, the closest measure the data holds." + "shown": "net disbursements (bilateral flows)", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds." } ], "assumptions": [ @@ -1278,10 +1391,10 @@ ], "status": "definite", "spec": { - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "definition": { "schema_version": 1, - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "identity": { "identity_version": "spec1", "shape": { @@ -1329,6 +1442,12 @@ "kind": "range", "start_year": 2022, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -1540,6 +1659,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2022", "end": "2022" @@ -1560,20 +1680,6 @@ "has_data": true, "observation_count": 111, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2022, "end_year": 2022 @@ -1601,30 +1707,12 @@ "financingProvider": 111, "financingRecipient": 1 } - }, - { - "year": 2021, - "observations": 103, - "series": 103, - "role_counts": { - "financingProvider": 103, - "financingRecipient": 1 - } - }, - { - "year": 2020, - "observations": 97, - "series": 97, - "role_counts": { - "financingProvider": 97, - "financingRecipient": 1 - } } ] }, "download": { "rows": 111, - "rows_exact": true, + "rows_exact": false, "series": 111, "window": { "start_year": 2022, @@ -1637,9 +1725,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -1648,7 +1736,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -1770,11 +1857,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -2070,7 +2157,7 @@ "start_year": 2022, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -2172,7 +2259,7 @@ "served_rows_exact": true } ], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -4179,11 +4266,11 @@ } } ], - "rendered_sentence": "Net disbursements to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. This shows net disbursements, the closest measure the data holds. Assumed: every provider.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. This shows net disbursements (bilateral flows), the closest measure the data holds. Assumed: every provider.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -4370,7 +4457,7 @@ }, { "kind": "text", - "text": "This shows net disbursements, the closest measure the data holds.", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds.", "segment": "departure", "entity_refs": [], "states": [], @@ -4416,21 +4503,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_e14699f9dcd167f0211081a726ae1031/cv_574e68a18917407b0f5534cfc9ff001b/files/sha256:7ef1038eb25d978077bb4f5b9c54e940052ccd2aedd3284e6fb9739f1deca1f4" + "origin_path": "/api/datasets/spec_c9f9d816838bf8da08a3de2849783273/cv_6405444d04fda3b7ee8eb651528ab410/files/sha256:bff41f3d3d6707d06d4de9224994ad02cff5bb4cf219c3d8e7b8c96244ca81f9" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A7ef1038eb25d978077bb4f5b9c54e940052ccd2aedd3284e6fb9739f1deca1f4?X-Goog-Signature=redacted", - "x-dfo-trace-id": "711e3c4e7e7d4f129f50e02cf1135838" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Abff41f3d3d6707d06d4de9224994ad02cff5bb4cf219c3d8e7b8c96244ca81f9?X-Goog-Signature=redacted", + "x-dfo-trace-id": "28cd3156b2bd4b60badf105c3ddc5138" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A7ef1038eb25d978077bb4f5b9c54e940052ccd2aedd3284e6fb9739f1deca1f4?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Abff41f3d3d6707d06d4de9224994ad02cff5bb4cf219c3d8e7b8c96244ca81f9?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -4451,13 +4538,12 @@ "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingProvider_kind", + "stat_var_label", "financingRecipient", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -4471,9 +4557,9 @@ "members": [ { "parts": [], - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", - "content_version": "cv_574e68a18917407b0f5534cfc9ff001b", - "sentence": "Net disbursements to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a." + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", + "content_version": "cv_6405444d04fda3b7ee8eb651528ab410", + "sentence": "Net disbursements (bilateral flows) to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a." } ], "missing": [] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.parquet b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.parquet index 1bab295..2a6044f 100644 Binary files a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.parquet and b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-kept.parquet differ diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.json index 5115795..d0d4c16 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.json @@ -5,17 +5,17 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:27Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:43Z" }, "call": [ { "op": "fetch", "spec": { - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "definition": { "schema_version": 1, - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "identity": { "identity_version": "spec1", "shape": { @@ -229,10 +229,16 @@ "kind": "range", "start_year": 1967, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1967 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1967 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -266,10 +272,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "definition": { "schema_version": 1, - "spec_id": "spec_b05b2b3ee21debf9e2ac3fbe03e05f94", + "spec_id": "spec_27826e5c4c3cf0358ca57e6db48b05e1", "identity": { "identity_version": "spec1", "shape": { @@ -483,6 +489,12 @@ "kind": "range", "start_year": 1967, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -510,13 +522,13 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "29988583850544838fc7cdcf4410c11c" + "x-dfo-trace-id": "d58e71364f17407297f7d1ae93358344" }, "json": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "identity": { "shape": { "kind": "statvar_schema", @@ -554,6 +566,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "destination": [ "country/KEN" @@ -567,8 +585,8 @@ } } }, - "content_version": "cv_a45fe84301ebe9f5f3d44cb042feacff", - "prepared_at": "2026-10-15T09:59:06Z", + "content_version": "cv_5da0981e9a904c5c372b19a4cb5aa103", + "prepared_at": "2026-11-15T21:45:53Z", "coverage": { "rows": 96, "dimensions": [ @@ -626,7 +644,7 @@ "source_data_url": "https://webfs-dcd.oecd.org/files/dotStat/DSD_DAC2/Table2a_Data.zip", "attribution": "OECD (2026), OECD DAC2A, OECD Data Explorer, https://webfs-dcd.oecd.org/files/dotStat/DSD_DAC2/Table2a_Data.zip (accessed on 2026-10-12)", "update_cadence": "Quarterly", - "last_update": "2026-10-12", + "last_update": "2026-10-29", "years_covered": "1960-2025", "granularity": "Annual, by provider and recipient", "currencies": [ @@ -637,6 +655,10 @@ "transformation": "Download the source data", "description": "The OECD publishes DAC2A in April, June, September and December. The complete table is downloaded from the OECD each time it is republished, and replaces the previous copy, so the data reflects the OECD's latest release." }, + { + "transformation": "Mark the partial year", + "description": "The OECD publishes data for a year as donors report it, and its final release in December of the following year covers every donor. Until then, the year is partial. The pipeline publishes it, and the import's provenance names it in `partialObservationDate`." + }, { "transformation": "Standardise providers and recipients", "description": "Provider and recipient codes are standardised to Data Commons IDs used across the platform, so data can be compared across datasets. The totals DAC2A reports for groups of providers, such as all DAC countries, and for groups of recipients, such as regions and income groups, are included as providers and recipients of their own. Where two provider codes name the same organisation and report the same figures, the figures are counted once. Where two recipient codes name the same organisation, such as IDA and IDA's Multilateral Debt Relief Initiative, their flows are added." @@ -655,6 +677,26 @@ } ], "version_history": [ + { + "date": "2026-10-29", + "title": "Partial year published, marked as partial", + "changes": [ + { + "kind": "changed", + "note": "The partial year, which only some donors have reported ahead of the OECD's final release in December, is included, and the import's provenance marks it with `partialObservationDate`." + } + ] + }, + { + "date": "2026-10-15", + "title": "Partial year excluded", + "changes": [ + { + "kind": "changed", + "note": "The partial year, which only some donors have reported ahead of the OECD's final release in December, is excluded." + } + ] + }, { "date": "2026-10-14", "title": "First release", @@ -677,6 +719,7 @@ "party_totals_left_out": [ { "role": "financingProvider", + "provenance": "provenance/ONEDAC2aBilateral", "entities": [ "AfricanDevelopmentBankGroup", "DACCountriesTotal", @@ -698,13 +741,13 @@ ], "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -725,27 +768,76 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 111, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 2022, + 2022 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_574e68a18917407b0f5534cfc9ff001b" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2022, "start_year": 2022 }, - "graph_revision": "dfo-dev-dc-datacommons-service-00249-9gv", + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { - "exported_at": "2026-10-13T21:51:17Z", - "content_hash": "602c7022fc21c17540a6873d93196ad6b967eaae3e71f9dce6dec178a735daf4", - "graph_endpoint": "https://dfo-dev-dc-datacommons-service-zms5lj4zhq-nn.a.run.app" + "exported_at": "2026-11-12T22:30:30Z", + "content_hash": "68c74212b6a5f923d3543f7bb04f7b791c28b62bfccd3d073ab03bfcb50216da", + "graph_endpoint": "graph_release" }, "source_revisions": [ { "source": "provenance/OECDDAC2A", - "revision": "2026-10-12" + "revision": "2026-10-29" } ], - "capability_version": "dset_1e6cd9546fac19e9", - "materialiser_build": "1d29a70e59f70570c5ed8d610ec83291c8eb6f54", + "capability_version": "dset_af2827aa39ed8c0d", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -756,12 +848,12 @@ "observation_count": 111 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", - "frame_grammar_version": "1.1.0", - "origin_catalogue_build_id": "20261013T114555Z-613cf5c2", + "family_member_count": null, + "family_member_digest": null, + "frame_grammar_version": "1.2.0", + "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:34.704617+00:00" + "confirmed_at": "2026-11-15T21:45:54.172725+00:00" }, "warnings": [], "diagnostics": [ @@ -773,30 +865,30 @@ ], "artifacts": [ { - "artifact_digest": "sha256:b6b1b11cd813990bfa3ec73915f7ba443e1de6f43f1745c8df6a36d464ac0f89", + "artifact_digest": "sha256:7bdc2c29cca9c1271cc2e06387b636e4e62093b8dbef02bf4f7c719442a1ab84", "rendering": { "bundle": false, "format": "parquet", "layout": 4, "without_party_totals": true }, - "bytes": 10333, + "bytes": 10233, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-01T07:38:10.616769+00:00", + "created_at": "2026-11-15T21:45:54.092554+00:00", "tier": "working", - "url": "/api/datasets/spec_e14699f9dcd167f0211081a726ae1031/cv_a45fe84301ebe9f5f3d44cb042feacff/files/sha256:b6b1b11cd813990bfa3ec73915f7ba443e1de6f43f1745c8df6a36d464ac0f89", + "url": "/api/datasets/spec_c9f9d816838bf8da08a3de2849783273/cv_5da0981e9a904c5c372b19a4cb5aa103/files/sha256:7bdc2c29cca9c1271cc2e06387b636e4e62093b8dbef02bf4f7c719442a1ab84", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:8e04fdf7882aef108c740e92cad0f94df9778f4816af785d808d53ea973de2dd", + "artifact_digest": "sha256:c100cda4d741d33a67b42a2a46657e49888e710afd3bf244c62f3f803d7f56ed", "rendering": { "statistics": "series" }, - "bytes": 9466, + "bytes": 9508, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-10-15T11:16:59.961737+00:00", + "created_at": "2026-11-15T21:45:54.092554+00:00", "tier": "working", - "url": "/api/datasets/spec_e14699f9dcd167f0211081a726ae1031/cv_a45fe84301ebe9f5f3d44cb042feacff/files/sha256:8e04fdf7882aef108c740e92cad0f94df9778f4816af785d808d53ea973de2dd" + "url": "/api/datasets/spec_c9f9d816838bf8da08a3de2849783273/cv_5da0981e9a904c5c372b19a4cb5aa103/files/sha256:c100cda4d741d33a67b42a2a46657e49888e710afd3bf244c62f3f803d7f56ed" } ], "series_count": 96, @@ -1169,7 +1261,8 @@ }, "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { - "pinned": true + "pinned": false, + "held_until": "2026-12-15T21:45:54.093291Z" } } } @@ -1223,6 +1316,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "destination": [ "country/KEN" @@ -1244,7 +1343,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "fe7c6b9db3e34265936ffadc6be2afda" + "x-dfo-trace-id": "fad62e1cec38414e85265725eda5f0b9" }, "json": { "schema_version": 1, @@ -1253,11 +1352,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "fe7c6b9db3e34265936ffadc6be2afda", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "fad62e1cec38414e85265725eda5f0b9", "warnings": [], "timing_ms": { - "total": 206, + "total": 4, "by_step": { "coverage": 0 } @@ -1272,13 +1371,16 @@ { "code": "role_scope_defaulted", "severity": "warn", - "message": "No provider was named, so the answer covers every provider with data." + "message": "No provider was named, so the answer covers all 96 providers with data to Kenya.", + "params": { + "axis": "origin" + } }, { "code": "whole_total_available", "severity": "info", "message": "The source publishes the total of every official donor as official donors (DAC); a sum of the listed donors includes private donors and differs from it.", - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "params": { "total": "DACOfficialDonors", "total_label": "official donors (DAC)", @@ -1287,39 +1389,11 @@ } ], "timing_ms": { - "total": 187, + "total": 0, "by_step": { - "validate": 1, - "phase_validate": 0, - "walk": 16, - "reread_arcs": 0, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 0, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 0, - "phase_where_places": 0, - "materialise": 43, - "phase_materialise": 1, - "ground_related": 8, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 17, - "ground_gates": 6, - "phase_ground_build": 87, - "finalize_preview": 0, - "options": 3, - "finalize_related": 0, - "finalize_wholes": 3, - "finalize_relaunch": 0, - "phase_finalize": 2, - "served_entry": 0 + "response_cache_part_memo": 0, + "served_entry": 0, + "as_composite": 0 } }, "entity_refs": [], @@ -1327,8 +1401,8 @@ "departures": [ { "code": "closest_match", - "shown": "net disbursements", - "text": "This shows net disbursements, the closest measure the data holds." + "shown": "net disbursements (bilateral flows)", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds." } ], "assumptions": [ @@ -1341,10 +1415,10 @@ ], "status": "definite", "spec": { - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "definition": { "schema_version": 1, - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "identity": { "identity_version": "spec1", "shape": { @@ -1392,6 +1466,12 @@ "kind": "range", "start_year": 2022, "end_year": 2022 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -1603,6 +1683,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2022", "end": "2022" @@ -1623,20 +1704,6 @@ "has_data": true, "observation_count": 111, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2022, "end_year": 2022 @@ -1664,30 +1731,12 @@ "financingProvider": 111, "financingRecipient": 1 } - }, - { - "year": 2021, - "observations": 103, - "series": 103, - "role_counts": { - "financingProvider": 103, - "financingRecipient": 1 - } - }, - { - "year": 2020, - "observations": 97, - "series": 97, - "role_counts": { - "financingProvider": 97, - "financingRecipient": 1 - } } ] }, "download": { "rows": 111, - "rows_exact": true, + "rows_exact": false, "series": 111, "window": { "start_year": 2022, @@ -1700,9 +1749,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -1711,7 +1760,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -1833,11 +1881,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -2133,7 +2181,7 @@ "start_year": 2022, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -2235,7 +2283,7 @@ "served_rows_exact": true } ], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -4242,11 +4290,11 @@ } } ], - "rendered_sentence": "Net disbursements to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. This shows net disbursements, the closest measure the data holds. Assumed: every provider.", + "rendered_sentence": "Net disbursements (bilateral flows) to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. This shows net disbursements (bilateral flows), the closest measure the data holds. Assumed: every provider.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -4433,7 +4481,7 @@ }, { "kind": "text", - "text": "This shows net disbursements, the closest measure the data holds.", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds.", "segment": "departure", "entity_refs": [], "states": [], @@ -4479,21 +4527,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_e14699f9dcd167f0211081a726ae1031/cv_a45fe84301ebe9f5f3d44cb042feacff/files/sha256:b6b1b11cd813990bfa3ec73915f7ba443e1de6f43f1745c8df6a36d464ac0f89" + "origin_path": "/api/datasets/spec_c9f9d816838bf8da08a3de2849783273/cv_5da0981e9a904c5c372b19a4cb5aa103/files/sha256:7bdc2c29cca9c1271cc2e06387b636e4e62093b8dbef02bf4f7c719442a1ab84" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ab6b1b11cd813990bfa3ec73915f7ba443e1de6f43f1745c8df6a36d464ac0f89?X-Goog-Signature=redacted", - "x-dfo-trace-id": "efc8b2fe2b94483fa60ddf8130f39fb8" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A7bdc2c29cca9c1271cc2e06387b636e4e62093b8dbef02bf4f7c719442a1ab84?X-Goog-Signature=redacted", + "x-dfo-trace-id": "3047a68d9c9d469aacce129256b99701" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ab6b1b11cd813990bfa3ec73915f7ba443e1de6f43f1745c8df6a36d464ac0f89?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A7bdc2c29cca9c1271cc2e06387b636e4e62093b8dbef02bf4f7c719442a1ab84?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -4514,13 +4562,12 @@ "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingProvider_kind", + "stat_var_label", "financingRecipient", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -4534,15 +4581,15 @@ "members": [ { "parts": [], - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", - "content_version": "cv_a45fe84301ebe9f5f3d44cb042feacff", - "sentence": "Net disbursements to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a." + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", + "content_version": "cv_5da0981e9a904c5c372b19a4cb5aa103", + "sentence": "Net disbursements (bilateral flows) to Kenya from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a." } ], "missing": [], "party_totals_left_out": [ { - "spec_id": "spec_e14699f9dcd167f0211081a726ae1031", + "spec_id": "spec_c9f9d816838bf8da08a3de2849783273", "role": "financingProvider", "entities": [ "AfricanDevelopmentBankGroup", @@ -4560,7 +4607,8 @@ "GroupOfSeven", "PostcodeLotteryGroup", "WorldBankGroup" - ] + ], + "provenance": "provenance/ONEDAC2aBilateral" } ] } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.parquet b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.parquet index 277ccce..8cff664 100644 Binary files a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.parquet and b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-party-totals-left-out.parquet differ diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-not-found.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-not-found.json index f1f6e30..ca24a72 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-not-found.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-not-found.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,7 +516,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 404, @@ -532,7 +544,7 @@ "trace_id": "00000000000000000000000000000000", "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5 ], diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-pacing-changes.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-pacing-changes.json index 1e3dc2d..18e945c 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-pacing-changes.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-pacing-changes.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,24 +516,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 2500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -530,24 +542,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 4000, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -556,24 +568,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1000, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -582,24 +594,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -637,6 +649,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -812,14 +830,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -841,14 +859,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -949,13 +967,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -976,13 +994,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -996,7 +1063,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1004,15 +1071,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1024,32 +1091,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1075,7 +1142,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1329,7 +1396,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1353,7 +1420,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1415,7 +1482,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1424,21 +1491,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1452,20 +1519,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1479,15 +1545,15 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 2.5, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited-not-retryable.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited-not-retryable.json index 6af5854..70aaea8 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited-not-retryable.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited-not-retryable.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,7 +516,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 429, @@ -529,7 +541,7 @@ "trace_id": "00000000000000000000000000000000", "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5 ], diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited.json index 1ede91f..79d1ae4 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-rate-limited.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,7 +516,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 429, @@ -516,24 +528,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -542,24 +554,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -568,24 +580,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -594,24 +606,50 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 1693, + "progress": { + "rows_written": 81393, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 1770, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2177, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -620,24 +658,76 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "3", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2780, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 3517, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "5", + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 2273, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 4455, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -646,24 +736,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -701,6 +791,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -876,14 +972,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -905,14 +1001,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1013,13 +1109,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1040,13 +1136,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1060,7 +1205,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1068,15 +1213,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1088,32 +1233,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1139,7 +1284,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1393,7 +1538,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1417,7 +1562,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1479,7 +1624,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1488,21 +1633,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1516,20 +1661,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1543,23 +1687,26 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 3.0, 1.5, 1.5, 1.5, - 1.77, - 2.273 + 1.693, + 2.177, + 2.78, + 3.517, + 4.455 ], "resubmissions": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-backoff.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-backoff.json index 6bb5916..48d8002 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-backoff.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-backoff.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,14 +499,14 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" } } } @@ -502,22 +514,22 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -526,7 +538,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 503, @@ -548,22 +560,94 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "progress": { + "rows_written": 2774, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "progress": { + "rows_written": 41096, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "progress": { + "rows_written": 81393, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -572,22 +656,22 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -596,22 +680,22 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -620,22 +704,22 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -644,24 +728,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -699,6 +783,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -874,14 +964,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -903,14 +993,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1011,13 +1101,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1038,13 +1128,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1058,7 +1197,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1066,15 +1205,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1086,32 +1225,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1137,7 +1276,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1391,7 +1530,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1415,7 +1554,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1477,7 +1616,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1486,21 +1625,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1514,20 +1653,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1541,15 +1679,15 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.0, 2.0, @@ -1557,6 +1695,9 @@ 8.0, 8.0, 8.0, + 8.0, + 8.0, + 8.0, 8.0 ], "resubmissions": 0 diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-retry-after.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-retry-after.json index f4fbc16..aa91b58 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-retry-after.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused-retry-after.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,7 +516,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 503, @@ -527,24 +539,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -553,24 +565,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -579,24 +591,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -605,24 +617,50 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 1693, + "progress": { + "rows_written": 81393, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 1770, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2177, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -631,24 +669,76 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "3", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2780, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 3517, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "5", + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 2273, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 4455, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -657,24 +747,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -712,6 +802,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -887,14 +983,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -916,14 +1012,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1024,13 +1120,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1051,13 +1147,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1071,7 +1216,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1079,15 +1224,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1099,32 +1244,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1150,7 +1295,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1404,7 +1549,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1428,7 +1573,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1490,7 +1635,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1499,21 +1644,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1527,20 +1672,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1554,23 +1698,26 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 5.0, 1.5, 1.5, 1.5, - 1.77, - 2.273 + 1.693, + 2.177, + 2.78, + 3.517, + 4.455 ], "resubmissions": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused.json index 781d768..7b9c4ff 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-poll-refused.json @@ -11,10 +11,10 @@ { "op": "fetch", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -226,12 +226,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -256,10 +262,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -471,8 +477,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -487,15 +499,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -504,7 +516,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 503, @@ -526,24 +538,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -552,24 +564,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -578,7 +590,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 503, @@ -600,7 +612,7 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 503, @@ -622,24 +634,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -648,24 +660,50 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 1693, + "progress": { + "rows_written": 81393, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 1770, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2177, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -674,24 +712,76 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "3", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2780, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 3517, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "5", + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 2273, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 4455, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -700,24 +790,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -755,6 +845,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -930,14 +1026,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -959,14 +1055,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1067,13 +1163,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1094,13 +1190,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1114,7 +1259,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1122,15 +1267,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1142,32 +1287,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1193,7 +1338,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1447,7 +1592,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1471,7 +1616,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1533,7 +1678,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1542,21 +1687,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1570,20 +1715,19 @@ "expect": [ { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1597,15 +1741,15 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 1.5, @@ -1614,8 +1758,11 @@ 1.5, 1.5, 1.5, - 1.77, - 2.273 + 1.693, + 2.177, + 2.78, + 3.517, + 4.455 ], "resubmissions": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-relative-location.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-relative-location.json index 485cf79..4e1d504 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-relative-location.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-relative-location.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -930,9 +930,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "bytes", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-request-invalid.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-request-invalid.json index 693d193..90a99a1 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-request-invalid.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-request-invalid.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:50Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:57Z" }, "call": [ { @@ -183,7 +183,7 @@ "status": 400, "headers": { "content-type": "application/problem+json", - "x-dfo-trace-id": "51f7fb766aaf4b1d969bcd90fea82957" + "x-dfo-trace-id": "349c2f7980484060a46e428ae3613f5d" }, "json": { "type": "/codes/request_invalid", @@ -213,7 +213,7 @@ "truncated": false } ], - "trace_id": "51f7fb766aaf4b1d969bcd90fea82957", + "trace_id": "349c2f7980484060a46e428ae3613f5d", "capability_version": "dset_af2827aa39ed8c0d", "retryable": false } @@ -225,7 +225,7 @@ "error": { "class": "InvalidRequestError", "code": "request_invalid", - "trace_id": "51f7fb766aaf4b1d969bcd90fea82957" + "trace_id": "349c2f7980484060a46e428ae3613f5d" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-resubmit-other-spec.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-resubmit-other-spec.json index e72b4ef..967898a 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-resubmit-other-spec.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-resubmit-other-spec.json @@ -183,7 +183,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "0ae759aa6d0f43958e209452cbb5cbe4" + "x-dfo-trace-id": "7da584d97aab41afad0f21d975cfc83a" }, "json": { "schema_version": 1, @@ -593,7 +593,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -1015,7 +1015,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "d60b8b5872ea42c8b2ebcabbb88bc48e" + "x-dfo-trace-id": "36be7857339d47a7bab0b6a7379ed66a" }, "json": { "schema_version": 1, @@ -1024,11 +1024,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "d60b8b5872ea42c8b2ebcabbb88bc48e", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "36be7857339d47a7bab0b6a7379ed66a", "warnings": [], "timing_ms": { - "total": 492, + "total": 4, "by_step": { "coverage": 0 } @@ -1041,38 +1041,9 @@ "variable_text": "dataset", "warnings": [], "timing_ms": { - "total": 476, + "total": 1, "by_step": { - "validate": 5, - "phase_validate": 0, - "walk": 298, - "reread_arcs": 1, - "phase_reread_arcs": 0, - "detect_edits": 0, - "phase_detect_edits": 0, - "resolve_survivors": 0, - "phase_resolve_survivors": 0, - "shape": 65, - "phase_build_shape": 0, - "bind": 0, - "phase_build_bindings": 0, - "where_places": 0, - "phase_where_places": 0, - "materialise": 19, - "phase_materialise": 0, - "ground_related": 1, - "ground_units": 0, - "ground_facets": 0, - "ground_convert": 0, - "answer": 22, - "ground_gates": 12, - "phase_ground_build": 51, - "finalize_preview": 0, - "options": 2, - "finalize_related": 0, - "finalize_wholes": 0, - "finalize_relaunch": 0, - "phase_finalize": 0, + "response_cache_part_memo": 1, "served_entry": 0 } }, @@ -2083,7 +2054,7 @@ "start_year": 2020, "end_year": 2023 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -4597,7 +4568,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "d60b8b5872ea42c8b2ebcabbb88bc48e" + "trace_id": "36be7857339d47a7bab0b6a7379ed66a" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-same-origin-artifact-url.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-same-origin-artifact-url.json index eb8ad35..7ef0de4 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-same-origin-artifact-url.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-same-origin-artifact-url.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -930,9 +930,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-signed-fetch-partial.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-signed-fetch-partial.json index 1cc39a9..4a2c841 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-signed-fetch-partial.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-signed-fetch-partial.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -930,9 +930,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, @@ -957,9 +957,9 @@ "response": { "status": 302, "headers": { - "content-type": "text/html", + "content-type": "text/html; charset=UTF-8", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ac44200969f19d73104d1bc24ebca905e59f749c2939234cdde10ba6f5a131170?X-Goog-Signature=redacted", - "x-dfo-trace-id": "b1f3b19366b34e68aebd3dd7c4318d47" + "x-dfo-trace-id": "d1d9ad25d61248459ff40ebbdf1ca2fa" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-storage-artifact-url.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-storage-artifact-url.json index a88dac7..2ee0e13 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-storage-artifact-url.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-storage-artifact-url.json @@ -176,7 +176,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1452d918e67c4b499833f81cc67a1350" + "x-dfo-trace-id": "c65f0cb980af42f48295577fcb536d34" }, "json": { "schema_version": 1, @@ -586,7 +586,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { @@ -928,7 +928,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1452d918e67c4b499833f81cc67a1350" + "trace_id": "c65f0cb980af42f48295577fcb536d34" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-strict-warning.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-strict-warning.json index 6e00d0d..accd7d6 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-strict-warning.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-spec-strict-warning.json @@ -587,7 +587,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261019T174519Z-2e5e8cfd", "served_from": "head", - "confirmed_at": "2026-11-14T13:57:21.733177+00:00" + "confirmed_at": "2026-11-15T21:45:41.111274+00:00" }, "warnings": [ { diff --git a/python/client-contract/src/dfo_client_contract/scenarios/fetch-strict-info-notice.json b/python/client-contract/src/dfo_client_contract/scenarios/fetch-strict-info-notice.json index e870b80..4a8e652 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/fetch-strict-info-notice.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/fetch-strict-info-notice.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "8bed5df00b974595ad418493ea0ade6d" + "x-dfo-trace-id": "d6b233624975426297250674cb0ddda2" }, "json": { "schema_version": 1, @@ -45,22 +45,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "8bed5df00b974595ad418493ea0ade6d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "d6b233624975426297250674cb0ddda2", "warnings": [], "timing_ms": { - "total": 3255, + "total": 1055, "by_step": { "coverage": 0, - "extract": 1131, - "exclusion_read": 568, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2757, - "output_tokens": 169, - "cached_tokens": 977, + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0, "jev_input_tokens": 6695, "jev_output_tokens": 2088 }, @@ -78,33 +78,33 @@ } ], "timing_ms": { - "total": 2109, + "total": 1049, "by_step": { - "recall": 216, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 3, - "shape_probe_coverage": 6, - "shape_probe": 104, - "shape_groups": 609, + "shape_arcs": 0, + "shape_probe_coverage": 5, + "shape_probe": 111, + "shape_groups": 74, "shape_labels": 1, - "shape_admission": 0, + "shape_admission": 1, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 98, + "shape_denominators": 0, + "shape_quantity": 77, "shape_rank": 0, - "shape": 864, + "shape": 292, "phase_prune_and_rank": 0, - "bind": 225, - "phase_bind": 137, - "phase_settle": 98, - "phase_place_bindings": 24, + "bind": 244, + "phase_bind": 80, + "phase_settle": 52, + "phase_place_bindings": 18, "phase_facet_requests": 0, - "materialise": 31, - "phase_materialise": 210, - "answer": 113, - "options": 106, - "phase_outcome": 84 + "materialise": 19, + "phase_materialise": 185, + "answer": 40, + "options": 43, + "phase_outcome": 75 } }, "restatement": { @@ -1211,7 +1211,7 @@ "held_by": [] } ], - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3363,7 +3363,7 @@ } } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [ { "axis": "sector", @@ -3963,7 +3963,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "ec03460d65374d2ebec1d1e36990e273" + "x-dfo-trace-id": "3fd417f4b6de4cbc951d10471c705cd8" }, "json": { "schema_version": 1, @@ -4367,7 +4367,7 @@ "frame_grammar_version": "1.1.0", "origin_catalogue_build_id": "20261011T194155Z-80081f08", "served_from": "head", - "confirmed_at": "2026-11-14T13:56:53.487696+00:00" + "confirmed_at": "2026-11-15T21:45:02.161762+00:00" }, "warnings": [ { @@ -4727,7 +4727,7 @@ "headers": { "content-type": "text/html", "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A421efacc2dc010af38112a087b0b49ff5539f61d2afd12a88272b27e99b5f5db?X-Goog-Signature=redacted", - "x-dfo-trace-id": "7385994748ff4d0f893c114a8272a43d" + "x-dfo-trace-id": "6ad230a24c054c348d20b568c8e92341" } } }, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.json b/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.json index 405e10c..73f1c7c 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.json @@ -5,17 +5,17 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:57:52Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:49:59Z" }, "call": [ { "op": "mint", "spec": { - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -227,12 +227,18 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a.", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a.", "entity_groups": { "destination": { "label": "G77 countries", @@ -260,10 +266,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "identity_version": "spec1", "shape": { @@ -475,8 +481,14 @@ }, "requested_window": { "kind": "range", - "start_year": 1971, + "start_year": 1973, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } } @@ -491,15 +503,15 @@ "status": 202, "headers": { "content-type": "application/json", - "location": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "location": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry-after": "2", - "x-dfo-trace-id": "f3764b3706e1427182c757dd7bf79d14" + "x-dfo-trace-id": "ab6ba1534209472aab250a94365715bd" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500 } } @@ -508,24 +520,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "227bc77bd3a14d40b684a11c94d402e3" + "x-dfo-trace-id": "80253a5733074c0397dad601142d33f5" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 104847 + "estimate_rows": 103020 } } } @@ -534,24 +546,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "64db79abc08047ee83dc0199f0175111" + "x-dfo-trace-id": "2589bbaa0a8a4b1bbd9ceb8822169545" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 32958, - "estimate_rows": 104847 + "rows_written": 2774, + "estimate_rows": 103020 } } } @@ -560,24 +572,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "938ac10fe0a243e48971514282d1e536" + "x-dfo-trace-id": "b4b9f56ada334d398f5a3f47d6e2dc57" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "retry_after_ms": 1500, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 41096, + "estimate_rows": 103020 } } } @@ -586,24 +598,50 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "745e481ee9a9409ea8fd68e9dc41a7f2" + "x-dfo-trace-id": "ec7ba9d1eb69424cb1ca07c569fdab5d" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 1693, + "progress": { + "rows_written": 81393, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "3b98afab461d4a3ea9236bb2a947cd26" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 1770, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2177, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -612,24 +650,76 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "3", - "x-dfo-trace-id": "e5630c3771974bcb84f17a466f6b88f9" + "x-dfo-trace-id": "acf313cf1b3541e79a1dd4315fb1d75b" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 2780, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "468178b7b8cd43cd94dd5812220d6d52" + }, + "json": { + "operation": { + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "status": "running", + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 3517, + "progress": { + "rows_written": 103020, + "estimate_rows": 103020 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "5", + "x-dfo-trace-id": "98058388ced34b489dbe245b776a874d" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "running", - "poll": "/api/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", - "retry_after_ms": 2273, + "poll": "/api/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", + "retry_after_ms": 4455, "progress": { - "rows_written": 104847, - "estimate_rows": 104847 + "rows_written": 103020, + "estimate_rows": 103020 } } } @@ -638,24 +728,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb" + "path": "/datasets/operations/op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "85ba8b3d296140c692c6b6dc3231f4ba" + "x-dfo-trace-id": "5c64a8a1bcc049299c963c6d2e979c38" }, "json": { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_3f584780b34a392865266115bc0ed086", + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", "identity": { "shape": { "kind": "statvar_schema", @@ -693,6 +783,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -868,14 +964,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } } }, - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "prepared_at": "2026-11-14T13:58:01Z", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "prepared_at": "2026-11-15T21:50:15Z", "coverage": { - "rows": 104847, + "rows": 103020, "dimensions": [ { "label": "financingProvider", @@ -897,14 +993,14 @@ }, { "label": "years", - "count": 54 + "count": 52 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 } }, "citation": { @@ -1005,13 +1101,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -1032,13 +1128,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 103020, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1973, + 2024 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_80ebba853400a9c37e81921188e2e187" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1971 + "start_year": 1973 }, - "graph_revision": null, + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { "exported_at": "2026-11-12T22:30:30Z", @@ -1052,7 +1197,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -1060,15 +1205,15 @@ "financingProvider", "financingRecipient" ], - "observation_count": 104847 + "observation_count": 103020 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:03.349181+00:00" + "confirmed_at": "2026-11-15T21:50:19.103144+00:00" }, "warnings": [], "diagnostics": [ @@ -1080,32 +1225,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "artifact_digest": "sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 466117, + "bytes": 458382, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9", + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09", + "artifact_digest": "sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716", "rendering": { "statistics": "series" }, - "bytes": 147802, + "bytes": 148371, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:03.291891+00:00", + "created_at": "2026-11-15T21:50:18.975744+00:00", "tier": "working", - "url": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:e647de857d16d1c79baa98a471e26383408a8fb2ad58e797826cf2240dacaf09" + "url": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:5778e7b37df79c53b7093a21dcce53b57ae52126c552c2ea92fcac9c20ead716" } ], - "series_count": 3657, + "series_count": 3656, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -1131,7 +1276,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 54 + "distinct": 52 }, { "name": "value", @@ -1385,7 +1530,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1409,7 +1554,7 @@ "varying": [ { "column": "time_period", - "distinct": 54 + "distinct": 52 } ] }, @@ -1471,7 +1616,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:03.292831Z" + "held_until": "2026-12-15T21:50:18.974822Z" } } } @@ -1480,21 +1625,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_3f584780b34a392865266115bc0ed086/cv_2460db7cfa2e46e2e23047133d79c8cb/files/sha256:193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9" + "origin_path": "/api/datasets/spec_de21d7663278160618ca9ab0d68e0a17/cv_4b2306be7790d46373fdb9b0484124f6/files/sha256:0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted", - "x-dfo-trace-id": "18a5c6d676a842d68bcce457fea88e86" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted", + "x-dfo-trace-id": "d6ebbcc241ee4bfa976bc36eefdeb5c2" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A193e93acacddbcef0c729ceade57ed7cdd616c65f2de036420996201190219c9?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A0d521b5672f4c9dd42194f99e5da156dfc93f71486e6b081e1312154b86c7157?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -1508,26 +1653,25 @@ "expect": [ { "operation": { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "status": "pending" } }, { "dataset": { - "rows": 104847, + "rows": 103020, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -1541,22 +1685,25 @@ "members": [ { "parts": [], - "spec_id": "spec_3f584780b34a392865266115bc0ed086", - "content_version": "cv_2460db7cfa2e46e2e23047133d79c8cb", - "sentence": "Net disbursements to the 133 G77 countries from the 32 DAC countries for official development assistance, 1971 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_de21d7663278160618ca9ab0d68e0a17", + "content_version": "cv_4b2306be7790d46373fdb9b0484124f6", + "sentence": "Net disbursements (bilateral flows) to the 133 G77 countries from the 32 DAC countries for official development assistance, 1973 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_702bf38557778b607997f2f89082d74394c3e17b45b9101739b03ef604229bcb", + "operation_id": "op_a2eeb734f24b76e5f19418557b6d9c74606ef499e40fe7dd4c4b5f8bcb25b14f", "poll_waits": [ 1.5, 1.5, 1.5, 1.5, - 1.77, - 2.273 + 1.693, + 2.177, + 2.78, + 3.517, + 4.455 ], "resubmissions": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.parquet b/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.parquet index be5286b..15392f0 100644 Binary files a/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.parquet and b/python/client-contract/src/dfo_client_contract/scenarios/mint-async-build.parquet differ diff --git a/python/client-contract/src/dfo_client_contract/scenarios/newest-version-unreadable-page.json b/python/client-contract/src/dfo_client_contract/scenarios/newest-version-unreadable-page.json index 225af35..e60f9a5 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/newest-version-unreadable-page.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/newest-version-unreadable-page.json @@ -93,7 +93,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1ea967c0fb3c4191b05d37e28f339d57" + "x-dfo-trace-id": "e8d9ece8485f4e1aa8a0e33ca16a4048" }, "json": { "schema_version": 1, @@ -145,7 +145,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1ea967c0fb3c4191b05d37e28f339d57" + "trace_id": "e8d9ece8485f4e1aa8a0e33ca16a4048" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/operation-failed-without-error.json b/python/client-contract/src/dfo_client_contract/scenarios/operation-failed-without-error.json index 120bce5..306377a 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/operation-failed-without-error.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/operation-failed-without-error.json @@ -10,7 +10,7 @@ "call": [ { "op": "operation", - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, { "op": "result" @@ -20,24 +20,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "8bf1f3b9e1c44ffc84654c7e0e915114" + "x-dfo-trace-id": "cf4b2693fc80431fbb912d2b1688c02b" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running", - "poll": "/api/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 108332 + "estimate_rows": 106365 } } } @@ -46,20 +46,20 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "796c81f825c948be9e670f9678c5af50" + "x-dfo-trace-id": "a4f689d4d8c5456fa97aa154d6a51c44" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "failed", - "poll": "/api/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "retry_after_ms": 1500 } } @@ -69,7 +69,7 @@ "expect": [ { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running" } }, @@ -77,10 +77,10 @@ "error": { "class": "ServerError", "code": "operation_failed", - "trace_id": "796c81f825c948be9e670f9678c5af50", + "trace_id": "a4f689d4d8c5456fa97aa154d6a51c44", "long_builds": [ { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "poll_waits": [ 1.5 ], diff --git a/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.json b/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.json index 7d5b0dd..b59dc52 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.json @@ -5,13 +5,13 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:06Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:23Z" }, "call": [ { "op": "operation", - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, { "op": "result" @@ -21,24 +21,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "8bf1f3b9e1c44ffc84654c7e0e915114" + "x-dfo-trace-id": "cf4b2693fc80431fbb912d2b1688c02b" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running", - "poll": "/api/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "retry_after_ms": 1500, "progress": { "rows_written": 0, - "estimate_rows": 108332 + "estimate_rows": 106365 } } } @@ -47,24 +47,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "796c81f825c948be9e670f9678c5af50" + "x-dfo-trace-id": "a4f689d4d8c5456fa97aa154d6a51c44" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running", - "poll": "/api/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "retry_after_ms": 1500, "progress": { - "rows_written": 24059, - "estimate_rows": 108332 + "rows_written": 39, + "estimate_rows": 106365 } } } @@ -73,24 +73,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "e019226dd55f4d2999b4bd61c7aeb0d2" + "x-dfo-trace-id": "fc2c2df34f4d40da83f15da06020310f" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running", - "poll": "/api/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "retry_after_ms": 1500, "progress": { - "rows_written": 105949, - "estimate_rows": 108332 + "rows_written": 38406, + "estimate_rows": 106365 } } } @@ -99,24 +99,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "4f5511860603455d8173dc79c66a2a5c" + "x-dfo-trace-id": "38cfc0afcdb040e3be1c7f650bd3c41a" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running", - "poll": "/api/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "retry_after_ms": 1500, "progress": { - "rows_written": 108332, - "estimate_rows": 108332 + "rows_written": 76973, + "estimate_rows": 106365 } } } @@ -125,24 +125,24 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", "retry-after": "2", - "x-dfo-trace-id": "c429311af2354c4084b781bce21e8167" + "x-dfo-trace-id": "3d7c043532814dec956283a3784e65ce" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running", - "poll": "/api/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", - "retry_after_ms": 1760, + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", + "retry_after_ms": 1757, "progress": { - "rows_written": 108332, - "estimate_rows": 108332 + "rows_written": 106365, + "estimate_rows": 106365 } } } @@ -151,24 +151,102 @@ { "request": { "method": "GET", - "path": "/datasets/operations/op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea" + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" }, "response": { "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "37907768c3124bbeb005e266c05f608c" + "retry-after": "3", + "x-dfo-trace-id": "3b64c96e68244badbfa413093e2562d3" }, "json": { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", + "status": "running", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", + "retry_after_ms": 2253, + "progress": { + "rows_written": 106365, + "estimate_rows": 106365 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "3", + "x-dfo-trace-id": "ffe3aefe28c6448fa9a48526c4a7d7e5" + }, + "json": { + "operation": { + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", + "status": "running", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", + "retry_after_ms": 2877, + "progress": { + "rows_written": 106365, + "estimate_rows": 106365 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "retry-after": "4", + "x-dfo-trace-id": "3c44f371801d4cbe8cf3da7905c56711" + }, + "json": { + "operation": { + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", + "status": "running", + "poll": "/api/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", + "retry_after_ms": 3653, + "progress": { + "rows_written": 106365, + "estimate_rows": 106365 + } + } + } + } + }, + { + "request": { + "method": "GET", + "path": "/datasets/operations/op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0" + }, + "response": { + "status": 200, + "headers": { + "content-type": "application/json", + "x-dfo-trace-id": "fa1db0717fed4fb59bb7ff56092fa38b" + }, + "json": { + "operation": { + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "done" }, "manifest": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_9f6fe7a636a44ce37e1840922d97d88b", + "spec_id": "spec_dd404789d1f410e2fc92630de5b718c9", "identity": { "shape": { "kind": "statvar_schema", @@ -206,6 +284,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -387,14 +471,14 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1972 + "start_year": 1974 } } }, - "content_version": "cv_cbecb5de86162437a29509a9c80845a0", - "prepared_at": "2026-11-14T13:58:13Z", + "content_version": "cv_791965e95366fe9edc7d161f0efbd337", + "prepared_at": "2026-11-15T21:50:38Z", "coverage": { - "rows": 108332, + "rows": 106365, "dimensions": [ { "label": "financingProvider", @@ -416,14 +500,14 @@ }, { "label": "years", - "count": 53 + "count": 51 } ], "window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1972 + "start_year": 1974 } }, "citation": { @@ -524,13 +608,13 @@ "trace": { "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -551,11 +635,62 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 106365, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 1974, + 2024 + ] + ], + "warnings": [ + "coverage_below_scope" + ], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_2649ffe37049a4d288a90705346cca5b" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2024, - "start_year": 1972 + "start_year": 1974 }, "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], @@ -571,7 +706,7 @@ } ], "capability_version": "dset_af2827aa39ed8c0d", - "materialiser_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -579,21 +714,21 @@ "financingProvider", "financingRecipient" ], - "observation_count": 108332 + "observation_count": 106365 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", + "family_member_count": null, + "family_member_digest": null, "frame_grammar_version": "1.2.0", "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "materialise", - "confirmed_at": "2026-11-14T13:58:15.416992+00:00" + "confirmed_at": "2026-11-15T21:50:42.263045+00:00" }, "warnings": [ { "code": "coverage_below_scope", "severity": "warn", - "message": "The served coverage falls short of the requested scope. No observations were served for 4 requested entities.", + "message": "The served coverage falls short of the requested scope. No observations were served for 4 requested entities. Of these, the bilateral component leaves out 4.", "unserved_entities": { "count": 4, "refs": [ @@ -614,32 +749,32 @@ ], "artifacts": [ { - "artifact_digest": "sha256:348ef92e8752a146821a2bb83cb7e20884b7a70dae96e737025a1c71866e6376", + "artifact_digest": "sha256:e62cd1ad066bdfcf453941df5a9b547f92c4afad4a985eaf315862b22abd81dc", "rendering": { "bundle": false, "format": "parquet", "layout": 4 }, - "bytes": 484790, + "bytes": 478204, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:15.365535+00:00", + "created_at": "2026-11-15T21:50:42.144222+00:00", "tier": "working", - "url": "/api/datasets/spec_9f6fe7a636a44ce37e1840922d97d88b/cv_cbecb5de86162437a29509a9c80845a0/files/sha256:348ef92e8752a146821a2bb83cb7e20884b7a70dae96e737025a1c71866e6376", + "url": "/api/datasets/spec_dd404789d1f410e2fc92630de5b718c9/cv_791965e95366fe9edc7d161f0efbd337/files/sha256:e62cd1ad066bdfcf453941df5a9b547f92c4afad4a985eaf315862b22abd81dc", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:ad95d701b0b06801ca7cbf18904907c4a52c5efbcc13dae2fbd1f1d4d9f9a41e", + "artifact_digest": "sha256:1be9ea96d159550a76e4df3d6a034ea73fcccf571003be0554f36f27e2128807", "rendering": { "statistics": "series" }, - "bytes": 156705, + "bytes": 157275, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-11-14T13:58:15.365535+00:00", + "created_at": "2026-11-15T21:50:42.144222+00:00", "tier": "working", - "url": "/api/datasets/spec_9f6fe7a636a44ce37e1840922d97d88b/cv_cbecb5de86162437a29509a9c80845a0/files/sha256:ad95d701b0b06801ca7cbf18904907c4a52c5efbcc13dae2fbd1f1d4d9f9a41e" + "url": "/api/datasets/spec_dd404789d1f410e2fc92630de5b718c9/cv_791965e95366fe9edc7d161f0efbd337/files/sha256:1be9ea96d159550a76e4df3d6a034ea73fcccf571003be0554f36f27e2128807" } ], - "series_count": 3908, + "series_count": 3906, "output_options": { "capability_version": "dset_af2827aa39ed8c0d", "columns": [ @@ -665,7 +800,7 @@ "name": "time_period", "kind": "grain", "droppable": false, - "distinct": 53 + "distinct": 51 }, { "name": "value", @@ -919,7 +1054,7 @@ "varying": [ { "column": "time_period", - "distinct": 53 + "distinct": 51 } ] }, @@ -943,7 +1078,7 @@ "varying": [ { "column": "time_period", - "distinct": 53 + "distinct": 51 } ] }, @@ -1005,7 +1140,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-12-14T13:58:15.365748Z" + "held_until": "2026-12-15T21:50:42.143052Z" } } } @@ -1060,6 +1195,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "origin": [ "country/AUS", @@ -1241,7 +1382,7 @@ "requested_window": { "kind": "range", "end_year": 2024, - "start_year": 1972 + "start_year": 1974 } } } @@ -1253,7 +1394,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "bdb0216100ef4968960fad75fdf8f674" + "x-dfo-trace-id": "4251b77cdde047be9c24476513fa0934" }, "json": { "schema_version": 1, @@ -1262,11 +1403,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "bdb0216100ef4968960fad75fdf8f674", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "4251b77cdde047be9c24476513fa0934", "warnings": [], "timing_ms": { - "total": 265, + "total": 383, "by_step": { "coverage": 0 } @@ -1279,9 +1420,9 @@ "variable_text": "dataset", "warnings": [], "timing_ms": { - "total": 186, + "total": 313, "by_step": { - "validate": 1, + "validate": 0, "phase_validate": 0, "walk": 1, "reread_arcs": 0, @@ -1292,26 +1433,27 @@ "phase_resolve_survivors": 0, "shape": 1, "phase_build_shape": 0, - "bind": 1, + "bind": 0, "phase_build_bindings": 0, "where_places": 1, "phase_where_places": 0, - "materialise": 34, + "materialise": 27, "phase_materialise": 0, "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, - "answer": 15, - "ground_gates": 18, - "phase_ground_build": 105, + "answer": 20, + "ground_gates": 19, + "phase_ground_build": 233, "finalize_preview": 0, - "options": 9, + "options": 11, "finalize_related": 0, "finalize_wholes": 0, "finalize_relaunch": 0, "phase_finalize": 0, - "served_entry": 0 + "served_entry": 0, + "as_composite": 0 } }, "entity_refs": [], @@ -1319,8 +1461,8 @@ "departures": [ { "code": "closest_match", - "shown": "net disbursements", - "text": "This shows net disbursements, the closest measure the data holds." + "shown": "net disbursements (bilateral flows)", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds." }, { "code": "entity_unavailable", @@ -1331,10 +1473,10 @@ "assumptions": [], "status": "definite", "spec": { - "spec_id": "spec_9f6fe7a636a44ce37e1840922d97d88b", + "spec_id": "spec_dd404789d1f410e2fc92630de5b718c9", "definition": { "schema_version": 1, - "spec_id": "spec_9f6fe7a636a44ce37e1840922d97d88b", + "spec_id": "spec_dd404789d1f410e2fc92630de5b718c9", "identity": { "identity_version": "spec1", "shape": { @@ -1374,6 +1516,46 @@ } ], "entities": { + "origin": [ + "country/AUS", + "country/AUT", + "country/BEL", + "country/CAN", + "country/CHE", + "country/CHL", + "country/COL", + "country/CRI", + "country/CZE", + "country/DEU", + "country/DNK", + "country/ESP", + "country/EST", + "country/FIN", + "country/FRA", + "country/GBR", + "country/GRC", + "country/HUN", + "country/IRL", + "country/ISL", + "country/ISR", + "country/ITA", + "country/JPN", + "country/KOR", + "country/LTU", + "country/LUX", + "country/LVA", + "country/MEX", + "country/NLD", + "country/NOR", + "country/NZL", + "country/POL", + "country/PRT", + "country/SVK", + "country/SVN", + "country/SWE", + "country/TUR", + "country/USA" + ], "destination": [ "country/AFG", "country/AGO", @@ -1508,52 +1690,18 @@ "country/ZAF", "country/ZMB", "country/ZWE" - ], - "origin": [ - "country/AUS", - "country/AUT", - "country/BEL", - "country/CAN", - "country/CHE", - "country/CHL", - "country/COL", - "country/CRI", - "country/CZE", - "country/DEU", - "country/DNK", - "country/ESP", - "country/EST", - "country/FIN", - "country/FRA", - "country/GBR", - "country/GRC", - "country/HUN", - "country/IRL", - "country/ISL", - "country/ISR", - "country/ITA", - "country/JPN", - "country/KOR", - "country/LTU", - "country/LUX", - "country/LVA", - "country/MEX", - "country/NLD", - "country/NOR", - "country/NZL", - "country/POL", - "country/PRT", - "country/SVK", - "country/SVN", - "country/SWE", - "country/TUR", - "country/USA" ] }, "requested_window": { "kind": "range", - "start_year": 1972, + "start_year": 1974, "end_year": 2024 + }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } } } }, @@ -2665,7 +2813,7 @@ "value": { "value_kind": "time_window", "time_window": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 } } @@ -2691,8 +2839,9 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { - "start": "1972", + "start": "1974", "end": "2024" } }, @@ -4107,24 +4256,10 @@ "coverage": { "kind": "exact", "has_data": true, - "observation_count": 108332, + "observation_count": 106365, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 53 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 } }, @@ -4132,7 +4267,7 @@ "year": 2024, "year_named": true, "named_window": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "observations": 2638, @@ -4172,11 +4307,11 @@ ] }, "download": { - "rows": 108332, - "rows_exact": true, - "series": 3908, + "rows": 106365, + "rows_exact": false, + "series": 3906, "window": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "licence": { @@ -4186,9 +4321,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -4197,7 +4332,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -4229,7 +4363,7 @@ "relation": "child", "parent": "DAC2aAidType206", "member_count": 2, - "served_rows": 26466, + "served_rows": 25782, "served_rows_exact": true }, { @@ -4256,7 +4390,7 @@ }, "relation": "root", "member_count": 1, - "served_rows": 16339, + "served_rows": 15922, "served_rows_exact": true }, { @@ -4269,7 +4403,7 @@ }, "relation": "root", "member_count": 1, - "served_rows": 108347, + "served_rows": 106380, "served_rows_exact": true }, { @@ -4325,11 +4459,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to 133 recipients from 38 providers for official development assistance, 1972 to 2024. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to 133 recipients from 38 providers for official development assistance, 1974 to 2024. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -4608,7 +4742,7 @@ }, { "kind": "slot", - "text": "1972 to 2024", + "text": "1974 to 2024", "axis": "when", "segment": "heading", "binding_ref": "when:", @@ -6001,10 +6135,10 @@ ], "query_qualifiers": [], "requested_window": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -6012,7 +6146,7 @@ { "definition": { "schema_version": 1, - "spec_id": "spec_6a53e69e5285dcf875dc87cdc682d936", + "spec_id": "spec_a3896c2ee6c50417039ec60d9ec22c76", "identity": { "identity_version": "spec1", "shape": { @@ -6230,7 +6364,7 @@ }, "requested_window": { "kind": "range", - "start_year": 1972, + "start_year": 1974, "end_year": 2024 } } @@ -6274,11 +6408,11 @@ } } ], - "served_rows": 107759, + "served_rows": 105799, "served_rows_exact": true } ], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -6335,7 +6469,7 @@ "end_year": 2021 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2023, @@ -6349,7 +6483,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2002, @@ -6363,7 +6497,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6377,7 +6511,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -6391,7 +6525,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1991, @@ -6405,7 +6539,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6415,11 +6549,11 @@ "code": "AUD", "noun": "Australian dollars", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -6433,7 +6567,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1995, @@ -6447,7 +6581,7 @@ "end_year": 2019 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2023, @@ -6461,7 +6595,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1996, @@ -6475,7 +6609,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6489,7 +6623,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6503,7 +6637,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6517,7 +6651,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6531,7 +6665,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1985, @@ -6545,7 +6679,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6559,7 +6693,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1986, @@ -6573,7 +6707,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6587,7 +6721,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6601,7 +6735,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6615,7 +6749,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -6629,7 +6763,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6639,11 +6773,11 @@ "code": "CAD", "noun": "Canadian dollars", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -6657,7 +6791,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1991, @@ -6667,11 +6801,11 @@ "code": "CHF", "noun": "Swiss francs", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -6685,7 +6819,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6699,7 +6833,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6713,7 +6847,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6727,7 +6861,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6741,7 +6875,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6755,7 +6889,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1998, @@ -6769,7 +6903,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1990, @@ -6779,11 +6913,11 @@ "code": "DKK", "noun": "Danish kroner", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -6797,7 +6931,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6811,7 +6945,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6825,7 +6959,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6839,7 +6973,7 @@ "end_year": 2019 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -6853,7 +6987,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6863,11 +6997,11 @@ "code": "EUR", "noun": "euros", "current_years": { - "start_year": 1973, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1973, @@ -6881,7 +7015,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6891,11 +7025,11 @@ "code": "GBP", "noun": "British pounds", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -6909,7 +7043,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1994, @@ -6923,7 +7057,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6937,7 +7071,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6951,7 +7085,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6965,7 +7099,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6979,7 +7113,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -6993,7 +7127,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7007,7 +7141,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7021,7 +7155,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7035,7 +7169,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2003, @@ -7049,7 +7183,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7063,7 +7197,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1997, @@ -7077,7 +7211,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7091,7 +7225,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2000, @@ -7105,7 +7239,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7119,7 +7253,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1997, @@ -7133,7 +7267,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7147,7 +7281,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7157,11 +7291,11 @@ "code": "JPY", "noun": "Japanese yen", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -7175,7 +7309,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7189,7 +7323,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -7203,7 +7337,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1986, @@ -7217,7 +7351,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7231,7 +7365,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1987, @@ -7245,7 +7379,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1995, @@ -7259,7 +7393,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2013, @@ -7273,7 +7407,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7287,7 +7421,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7301,7 +7435,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7315,7 +7449,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7329,7 +7463,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7343,7 +7477,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7357,7 +7491,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -7371,7 +7505,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7385,7 +7519,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -7399,7 +7533,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1998, @@ -7413,7 +7547,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7427,7 +7561,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2001, @@ -7441,7 +7575,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1990, @@ -7455,7 +7589,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7469,7 +7603,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7483,7 +7617,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7497,7 +7631,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7511,7 +7645,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7525,7 +7659,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7539,7 +7673,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1989, @@ -7553,7 +7687,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1990, @@ -7567,7 +7701,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1987, @@ -7577,11 +7711,11 @@ "code": "NOK", "noun": "Norwegian kroner", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -7595,7 +7729,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7605,11 +7739,11 @@ "code": "NZD", "noun": "New Zealand dollars", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1961, @@ -7623,7 +7757,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7637,7 +7771,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7651,7 +7785,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7665,7 +7799,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7679,7 +7813,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7693,7 +7827,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1998, @@ -7707,7 +7841,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7721,7 +7855,7 @@ "end_year": 1990 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2023, @@ -7735,7 +7869,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2013, @@ -7749,7 +7883,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1997, @@ -7763,7 +7897,7 @@ "end_year": 2020 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2010, @@ -7777,7 +7911,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7791,7 +7925,7 @@ "end_year": 2023 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2000, @@ -7805,7 +7939,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7819,7 +7953,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7833,7 +7967,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7843,11 +7977,11 @@ "code": "SEK", "noun": "Swedish kronor", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -7861,7 +7995,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7875,7 +8009,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7889,7 +8023,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7903,7 +8037,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2011, @@ -7917,7 +8051,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7931,7 +8065,7 @@ "end_year": 2010 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7945,7 +8079,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -7959,7 +8093,7 @@ "end_year": 2016 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2018, @@ -7973,7 +8107,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -7987,7 +8121,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -8001,7 +8135,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8015,7 +8149,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8029,7 +8163,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1990, @@ -8043,7 +8177,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8057,7 +8191,7 @@ "end_year": 2016 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2023, @@ -8071,7 +8205,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8085,7 +8219,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1991, @@ -8099,7 +8233,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8109,11 +8243,11 @@ "code": "USD", "noun": "US dollars", "current_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1960, @@ -8127,7 +8261,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8141,7 +8275,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1992, @@ -8155,7 +8289,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2017, @@ -8169,7 +8303,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8183,7 +8317,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8197,7 +8331,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8211,7 +8345,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8225,7 +8359,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8239,7 +8373,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8253,7 +8387,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 2014, @@ -8267,7 +8401,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8281,7 +8415,7 @@ "end_year": 2024 }, "constant_years": { - "start_year": 1972, + "start_year": 1974, "end_year": 2024 }, "base_year_min": 1980, @@ -8296,11 +8430,11 @@ } } ], - "rendered_sentence": "Net disbursements to 133 recipients from 38 providers for official development assistance, 1972 to 2024. Current US dollars · OECD DAC2a. This shows net disbursements, the closest measure the data holds. You asked for Chile, Colombia, Costa Rica, and Mexico. The data holds no values for them.", + "rendered_sentence": "Net disbursements (bilateral flows) to 133 recipients from 38 providers for official development assistance, 1974 to 2024. Current US dollars · OECD DAC2a. This shows net disbursements (bilateral flows), the closest measure the data holds. You asked for Chile, Colombia, Costa Rica, and Mexico. The data holds no values for them.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -8589,7 +8723,7 @@ }, { "kind": "slot", - "text": "1972 to 2024", + "text": "1974 to 2024", "axis": "when", "segment": "heading", "binding_ref": "when:", @@ -8658,7 +8792,7 @@ }, { "kind": "text", - "text": "This shows net disbursements, the closest measure the data holds.", + "text": "This shows net disbursements (bilateral flows), the closest measure the data holds.", "segment": "departure", "entity_refs": [], "states": [], @@ -8688,21 +8822,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_9f6fe7a636a44ce37e1840922d97d88b/cv_cbecb5de86162437a29509a9c80845a0/files/sha256:348ef92e8752a146821a2bb83cb7e20884b7a70dae96e737025a1c71866e6376" + "origin_path": "/api/datasets/spec_dd404789d1f410e2fc92630de5b718c9/cv_791965e95366fe9edc7d161f0efbd337/files/sha256:e62cd1ad066bdfcf453941df5a9b547f92c4afad4a985eaf315862b22abd81dc" }, "response": { "status": 302, "headers": { - "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A348ef92e8752a146821a2bb83cb7e20884b7a70dae96e737025a1c71866e6376?X-Goog-Signature=redacted", - "x-dfo-trace-id": "755e08bdc5804ff885888a790ed43a90" + "content-type": "text/html; charset=UTF-8", + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ae62cd1ad066bdfcf453941df5a9b547f92c4afad4a985eaf315862b22abd81dc?X-Goog-Signature=redacted", + "x-dfo-trace-id": "7caff89fa8aa4e3991957519f3c811a1" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A348ef92e8752a146821a2bb83cb7e20884b7a70dae96e737025a1c71866e6376?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3Ae62cd1ad066bdfcf453941df5a9b547f92c4afad4a985eaf315862b22abd81dc?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -8716,26 +8850,25 @@ "expect": [ { "operation": { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "status": "running" } }, { "dataset": { - "rows": 108332, + "rows": 106365, "columns": [ "time_period", "financingProvider_label", "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingRecipient", + "stat_var_label", "financingProvider_kind", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -8749,21 +8882,24 @@ "members": [ { "parts": [], - "spec_id": "spec_9f6fe7a636a44ce37e1840922d97d88b", - "content_version": "cv_cbecb5de86162437a29509a9c80845a0", - "sentence": "Net disbursements to 133 recipients from 38 providers for official development assistance, 1972 to 2024. Current US dollars · OECD DAC2a." + "spec_id": "spec_dd404789d1f410e2fc92630de5b718c9", + "content_version": "cv_791965e95366fe9edc7d161f0efbd337", + "sentence": "Net disbursements (bilateral flows) to 133 recipients from 38 providers for official development assistance, 1974 to 2024. Current US dollars · OECD DAC2a." } ], "missing": [], "long_builds": [ { - "operation_id": "op_4c95a7ff2fba0ebd32f5ac085d9a8e180abc2cec26c2e31ff7d8ba7bd8c684ea", + "operation_id": "op_4c1d9ea087cb0f2553b3986f8300a703cca6737cfef011ca264a14e43fb04bf0", "poll_waits": [ 1.5, 1.5, 1.5, 1.5, - 1.76 + 1.757, + 2.253, + 2.877, + 3.653 ], "resubmissions": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.parquet b/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.parquet index e4f3be3..2fa9184 100644 Binary files a/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.parquet and b/python/client-contract/src/dfo_client_contract/scenarios/operation-resume.parquet differ diff --git a/python/client-contract/src/dfo_client_contract/scenarios/resubmit-candidates-sibling.json b/python/client-contract/src/dfo_client_contract/scenarios/resubmit-candidates-sibling.json index f837fcb..a3a7547 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/resubmit-candidates-sibling.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/resubmit-candidates-sibling.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:46Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:58Z" }, "call": [ { @@ -36,7 +36,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "341d46bcb06242e7b648aa9ef5566c55" + "x-dfo-trace-id": "9d7fc2cb81414a05ac4f5dff3ef401ab" }, "json": { "schema_version": 1, @@ -47,21 +47,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "341d46bcb06242e7b648aa9ef5566c55", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "9d7fc2cb81414a05ac4f5dff3ef401ab", "warnings": [], "timing_ms": { - "total": 7693, + "total": 3829, "by_step": { "coverage": 0, - "extract": 1181, - "exclusion_read": 1131, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2777, - "output_tokens": 216, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 27913, "jev_output_tokens": 5996 @@ -74,31 +74,31 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 3633, + "total": 3734, "by_step": { - "recall": 3, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe": 71, - "shape_groups": 8, + "shape_arcs": 1, + "shape_probe": 111, + "shape_groups": 5, "shape_labels": 1, - "shape_admission": 7, + "shape_admission": 121, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 80, - "shape_rank": 23, - "shape": 205, + "shape_denominators": 7, + "shape_quantity": 1105, + "shape_rank": 40, + "shape": 1411, "phase_prune_and_rank": 0, - "bind": 160, - "phase_bind": 16, + "bind": 173, + "phase_bind": 14, "phase_settle": 1, - "phase_place_bindings": 31, + "phase_place_bindings": 321, "phase_facet_requests": 0, - "materialise": 158, - "phase_materialise": 62, - "answer": 43, - "phase_outcome": 2954 + "materialise": 323, + "phase_materialise": 56, + "answer": 46, + "phase_outcome": 1387 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -804,7 +804,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2357,7 +2357,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2396,32 +2396,32 @@ } ], "timing_ms": { - "total": 6495, + "total": 3734, "by_step": { - "recall": 250, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 84, - "shape_probe_coverage": 4, - "shape_probe": 103, - "shape_groups": 243, + "shape_arcs": 1, + "shape_probe_coverage": 10, + "shape_probe": 119, + "shape_groups": 139, "shape_labels": 1, - "shape_admission": 9, + "shape_admission": 2, "phase_derive_shapes": 0, - "shape_denominators": 1, - "shape_quantity": 67, - "shape_rank": 352, - "shape": 2268, + "shape_denominators": 0, + "shape_quantity": 86, + "shape_rank": 303, + "shape": 1109, "phase_prune_and_rank": 0, - "bind": 505, - "phase_bind": 644, - "phase_settle": 38, - "phase_place_bindings": 1724, + "bind": 205, + "phase_bind": 257, + "phase_settle": 24, + "phase_place_bindings": 640, "phase_facet_requests": 0, - "materialise": 166, - "phase_materialise": 136, - "answer": 305, - "phase_outcome": 458 + "materialise": 284, + "phase_materialise": 125, + "answer": 12, + "phase_outcome": 1077 } }, "rendered_sentence": "2 readings. Kenya's annual amount of emissions: carbon dioxide. Air and GHG emissions · 2013 to 2020. Kenya's annual amount of emissions: carbon dioxide. Air and GHG emissions · 2013 to 2020.", @@ -3300,7 +3300,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -3800,7 +3800,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -4388,7 +4388,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "162bbd418e9040ac8d75abb2cf7d942d" + "x-dfo-trace-id": "3006ec51226b44e885ff86397d7a2a37" }, "json": { "schema_version": 1, @@ -4397,11 +4397,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "162bbd418e9040ac8d75abb2cf7d942d", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "3006ec51226b44e885ff86397d7a2a37", "warnings": [], "timing_ms": { - "total": 847, + "total": 543, "by_step": { "coverage": 0 } @@ -4414,7 +4414,7 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 434, + "total": 492, "by_step": { "validate": 0, "phase_validate": 0, @@ -4425,28 +4425,28 @@ "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 157, + "shape": 306, "phase_build_shape": 0, "bind": 0, "phase_build_bindings": 0, "where_places": 0, "phase_where_places": 0, - "materialise": 123, + "materialise": 103, "phase_materialise": 0, - "ground_related": 7, + "ground_related": 1, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, - "answer": 2, + "answer": 1, "ground_gates": 0, "phase_ground_build": 2, "finalize_preview": 0, - "options": 1, - "finalize_related": 140, + "options": 0, + "finalize_related": 79, "finalize_wholes": 0, - "finalize_relaunch": 1, + "finalize_relaunch": 0, "phase_finalize": 0, - "served_entry": 1 + "served_entry": 0 } }, "entity_refs": [], @@ -4955,7 +4955,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -5018,37 +5018,37 @@ } ], "timing_ms": { - "total": 1244, + "total": 315, "by_step": { - "validate": 2, + "validate": 0, "phase_validate": 0, - "walk": 1011, - "reread_arcs": 2, + "walk": 1, + "reread_arcs": 0, "phase_reread_arcs": 0, "detect_edits": 0, "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 8, + "shape": 6, "phase_build_shape": 0, "bind": 0, "phase_build_bindings": 0, "where_places": 0, "phase_where_places": 0, - "materialise": 126, + "materialise": 201, "phase_materialise": 0, - "ground_related": 1, + "ground_related": 0, "ground_units": 0, "ground_facets": 0, "ground_convert": 0, - "answer": 11, - "ground_gates": 1, - "phase_ground_build": 7, + "answer": 6, + "ground_gates": 0, + "phase_ground_build": 4, "finalize_preview": 0, - "options": 74, + "options": 95, "finalize_related": 0, "finalize_wholes": 0, - "finalize_relaunch": 0, + "finalize_relaunch": 1, "phase_finalize": 1 } }, @@ -5890,7 +5890,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, @@ -6386,7 +6386,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/resubmit-placeholder-without-restatement.json b/python/client-contract/src/dfo_client_contract/scenarios/resubmit-placeholder-without-restatement.json index 2acb02f..f265c27 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/resubmit-placeholder-without-restatement.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/resubmit-placeholder-without-restatement.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:59:08Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:51:10Z" }, "call": [ { @@ -36,7 +36,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "3eb37e91cadb46ceb28c63432f0d53bd" + "x-dfo-trace-id": "43d9728d5fc0498e88134b8442256097" }, "json": { "schema_version": 1, @@ -47,21 +47,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "3eb37e91cadb46ceb28c63432f0d53bd", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "43d9728d5fc0498e88134b8442256097", "warnings": [], "timing_ms": { - "total": 4181, + "total": 2980, "by_step": { "coverage": 0, - "extract": 1371, - "exclusion_read": 1023, + "extract": 0, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2777, - "output_tokens": 224, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0, "jev_input_tokens": 20297, "jev_output_tokens": 4337 @@ -74,31 +74,31 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 2798, + "total": 2970, "by_step": { - "recall": 5, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe": 80, - "shape_groups": 10, + "shape_arcs": 1, + "shape_probe": 82, + "shape_groups": 5, "shape_labels": 1, - "shape_admission": 6, + "shape_admission": 3, "phase_derive_shapes": 0, "shape_denominators": 1, - "shape_quantity": 84, - "shape_rank": 26, - "shape": 224, + "shape_quantity": 145, + "shape_rank": 16, + "shape": 263, "phase_prune_and_rank": 0, - "bind": 143, - "phase_bind": 19, + "bind": 717, + "phase_bind": 12, "phase_settle": 1, - "phase_place_bindings": 48, + "phase_place_bindings": 24, "phase_facet_requests": 0, - "materialise": 47, - "phase_materialise": 70, - "answer": 46, - "phase_outcome": 2195 + "materialise": 17, + "phase_materialise": 52, + "answer": 52, + "phase_outcome": 1830 } }, "rendered_sentence": "2 readings. Kenya's deaths rate per 1,000 people. World Development Indicators · 2013 to 2022. Kenya's number of deaths. Kenya Census · 2018 to 2022.", @@ -804,7 +804,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2357,7 +2357,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -2383,25 +2383,25 @@ "variable_text": "savings", "warnings": [], "timing_ms": { - "total": 2602, + "total": 1101, "by_step": { - "recall": 261, - "phase_resolve_places": 1, + "recall": 1, + "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 2, - "shape_probe_coverage": 1, - "shape_probe": 68, - "shape_groups": 257, + "shape_arcs": 1, + "shape_probe_coverage": 5, + "shape_probe": 134, + "shape_groups": 81, "shape_labels": 1, - "shape_admission": 20, + "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 125, - "shape_rank": 347, - "shape": 1393, + "shape_quantity": 95, + "shape_rank": 210, + "shape": 753, "phase_prune_and_rank": 0, - "bind": 651, - "phase_bind": 296 + "bind": 118, + "phase_bind": 229 } }, "rendered_sentence": "Could not match \"savings\" to a supported indicator. Try a different wording or a related indicator.", @@ -2738,7 +2738,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "4b96c4194537450881671c3ffa0b9719" + "x-dfo-trace-id": "ba6f7272ff934205ba94535f62cdf250" }, "json": { "schema_version": 1, @@ -2747,11 +2747,11 @@ "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "4b96c4194537450881671c3ffa0b9719", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "ba6f7272ff934205ba94535f62cdf250", "warnings": [], "timing_ms": { - "total": 371, + "total": 323, "by_step": { "coverage": 0 } @@ -2764,7 +2764,7 @@ "variable_text": "mortality", "warnings": [], "timing_ms": { - "total": 264, + "total": 275, "by_step": { "validate": 0, "phase_validate": 0, @@ -2775,21 +2775,21 @@ "phase_detect_edits": 0, "resolve_survivors": 0, "phase_resolve_survivors": 0, - "shape": 175, + "shape": 187, "phase_build_shape": 0, "bind": 0, "phase_build_bindings": 0, "where_places": 0, "phase_where_places": 0, - "materialise": 82, + "materialise": 83, "phase_materialise": 0, "ground_related": 0, "ground_units": 0, - "ground_facets": 1, + "ground_facets": 0, "ground_convert": 0, "answer": 2, "ground_gates": 0, - "phase_ground_build": 2, + "phase_ground_build": 1, "finalize_preview": 0, "options": 0, "finalize_related": 2, @@ -3305,7 +3305,7 @@ "start_year": 2013, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3" + "capability_version": "cap_eed8849e3076f272" }, "confidence": "high", "available_at_place": true, diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-body-not-an-object.json b/python/client-contract/src/dfo_client_contract/scenarios/search-body-not-an-object.json index 3ff5583..d1e1695 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-body-not-an-object.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-body-not-an-object.json @@ -30,7 +30,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": [ { @@ -42,22 +42,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -67,11 +67,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", @@ -266,7 +266,7 @@ "error": { "class": "ContractError", "code": "contract_violation", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f" + "trace_id": "264af30e460747b4859f987898038f4c" } } ] diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous-twice.json b/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous-twice.json index 3d1b30a..ab8c57c 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous-twice.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous-twice.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:25Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:46Z" }, "call": [ { @@ -31,7 +31,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "326cd5bd811c420193834cb8336356f7" + "x-dfo-trace-id": "22720754908a43c59e56059ebe972d49" }, "json": { "schema_version": 1, @@ -39,24 +39,22 @@ "entry_path": "raw_text", "raw_query": "aid from Congo to Congo", "normalized_query": "aid from Congo to Congo", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "326cd5bd811c420193834cb8336356f7", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "22720754908a43c59e56059ebe972d49", "warnings": [], "timing_ms": { - "total": 1299, + "total": 1, "by_step": { "coverage": 0, - "extract": 1088, - "exclusion_read": 1045, - "cache_lookup": 0 + "response_cache_layer1": 0 } }, "llm_usage": { - "input_tokens": 2747, - "output_tokens": 176, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0 }, "timed_out": false @@ -67,9 +65,9 @@ "variable_text": "aid", "warnings": [], "timing_ms": { - "total": 204, + "total": 2021, "by_step": { - "recall": 204, + "recall": 2021, "phase_resolve_places": 0, "phase_check_entities": 0 } diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous.json b/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous.json index 768a695..63825c9 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-place-ambiguous.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:20Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:46Z" }, "call": [ { @@ -31,7 +31,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -42,22 +42,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -67,11 +67,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-proxy-rate-limited.json b/python/client-contract/src/dfo_client_contract/scenarios/search-proxy-rate-limited.json index 3f256a0..da2d78d 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-proxy-rate-limited.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-proxy-rate-limited.json @@ -61,7 +61,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -72,22 +72,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -97,11 +97,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-retry-after-503.json b/python/client-contract/src/dfo_client_contract/scenarios/search-retry-after-503.json index 27e6b4e..69cf7e8 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-retry-after-503.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-retry-after-503.json @@ -60,7 +60,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f" + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c" }, "json": { "schema_version": 1, @@ -71,22 +71,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -96,11 +96,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-server-warning.json b/python/client-contract/src/dfo_client_contract/scenarios/search-server-warning.json index 5bbdf32..e2c80ea 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-server-warning.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-server-warning.json @@ -38,7 +38,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f", + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c", "x-dfo-warning": "Search runs on a reduced index while it is rebuilt." }, "json": { @@ -50,22 +50,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -75,11 +75,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", @@ -283,7 +283,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f", + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c", "x-dfo-warning": "Search runs on a reduced index while it is rebuilt.", "sunset": "Sat, 01 May 2027 00:00:00 GMT" }, @@ -296,22 +296,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -321,11 +321,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", @@ -529,7 +529,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f", + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c", "x-dfo-warning": "Search answers from a cached release.", "deprecation": "@1777593600", "sunset": "Sat, 01 May 2027 00:00:00 GMT" @@ -543,22 +543,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -568,11 +568,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-sunset-warning.json b/python/client-contract/src/dfo_client_contract/scenarios/search-sunset-warning.json index ceb7c14..4079681 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-sunset-warning.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-sunset-warning.json @@ -34,7 +34,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f", + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c", "sunset": "Sat, 01 May 2027 00:00:00 GMT" }, "json": { @@ -46,22 +46,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -71,11 +71,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", @@ -279,7 +279,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "1a8b9a64a34841cfbb333614cb6a431f", + "x-dfo-trace-id": "264af30e460747b4859f987898038f4c", "sunset": "Sat, 01 May 2027 00:00:00 GMT" }, "json": { @@ -291,22 +291,22 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "1a8b9a64a34841cfbb333614cb6a431f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "264af30e460747b4859f987898038f4c", "warnings": [], "timing_ms": { - "total": 1389, + "total": 6, "by_step": { "coverage": 0, - "extract": 1224, - "exclusion_read": 828, + "extract": 1, + "exclusion_read": 0, "cache_lookup": 0 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 210, - "cached_tokens": 977 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -316,11 +316,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 160, + "total": 1, "by_step": { - "recall": 159, + "recall": 1, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-two-parts-place-ambiguous.json b/python/client-contract/src/dfo_client_contract/scenarios/search-two-parts-place-ambiguous.json index 1839882..7187872 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-two-parts-place-ambiguous.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-two-parts-place-ambiguous.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:22Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:46Z" }, "call": [ { @@ -31,7 +31,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "bb77ea7f5f384de0a5f43efefc8af840" + "x-dfo-trace-id": "52161dd26d554215a59d13ec806a13c1" }, "json": { "schema_version": 1, @@ -42,21 +42,21 @@ "extract_skipped": false }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "bb77ea7f5f384de0a5f43efefc8af840", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "52161dd26d554215a59d13ec806a13c1", "warnings": [], "timing_ms": { - "total": 2460, + "total": 8, "by_step": { "coverage": 0, - "extract": 1201, - "exclusion_read": 768, - "cache_lookup": 0 + "extract": 0, + "exclusion_read": 0, + "cache_lookup": 1 } }, "llm_usage": { - "input_tokens": 2765, - "output_tokens": 247, + "input_tokens": 0, + "output_tokens": 0, "cached_tokens": 0 }, "timed_out": false @@ -67,9 +67,9 @@ "variable_text": "GDP", "warnings": [], "timing_ms": { - "total": 4, + "total": 2, "by_step": { - "recall": 4, + "recall": 2, "phase_resolve_places": 0, "phase_check_entities": 0 } @@ -202,11 +202,11 @@ "variable_text": "ODA disbursements", "warnings": [], "timing_ms": { - "total": 6, + "total": 2, "by_step": { - "recall": 5, + "recall": 2, "phase_resolve_places": 0, - "phase_check_entities": 1 + "phase_check_entities": 0 } }, "rendered_sentence": "\"Congo's\" matches more than one entity: \"Congo [DRC]\" and \"Congo [Republic]\". Be more specific.", diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.json b/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.json index fd8593c..ac1894f 100644 --- a/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.json +++ b/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.json @@ -5,8 +5,8 @@ "origin": { "kind": "recorded", "base_url": "https://dfo-dev-apis-zms5lj4zhq-nn.a.run.app/api", - "dfo_commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "recorded_at": "2026-11-14T13:58:30Z" + "dfo_commit": "7af2d8dd04797724b716496aea8182590a1a26d0", + "recorded_at": "2026-11-15T21:50:49Z" }, "call": [ { @@ -38,7 +38,7 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "26dd51cbb8fb4abca105349fa3a7ee1f" + "x-dfo-trace-id": "b2223c5802ee4772bdbcbc0f963bc3b9" }, "json": { "schema_version": 1, @@ -46,27 +46,23 @@ "entry_path": "raw_text", "raw_query": "top 5 donors to Ethiopia in 2022", "normalized_query": "top 5 donors to Ethiopia in 2022", - "extract_skipped": false + "extract_skipped": true }, "diagnostics": { - "engine_build": "aacbe6a4ab961d30f774cf89cacb0210e1280655", - "trace_id": "26dd51cbb8fb4abca105349fa3a7ee1f", + "engine_build": "7af2d8dd04797724b716496aea8182590a1a26d0", + "trace_id": "b2223c5802ee4772bdbcbc0f963bc3b9", "warnings": [], "timing_ms": { - "total": 1626, + "total": 3, "by_step": { "coverage": 0, - "extract": 960, - "exclusion_read": 542, - "cache_lookup": 0 + "response_cache_layer1": 1 } }, "llm_usage": { - "input_tokens": 2761, - "output_tokens": 215, - "cached_tokens": 0, - "jev_input_tokens": 4485, - "jev_output_tokens": 849 + "input_tokens": 0, + "output_tokens": 0, + "cached_tokens": 0 }, "timed_out": false }, @@ -83,13 +79,16 @@ { "code": "role_scope_defaulted", "severity": "warn", - "message": "No provider was named, so the answer covers every provider with data." + "message": "No provider was named, so the answer covers all 96 providers with data to Ethiopia.", + "params": { + "axis": "origin" + } }, { "code": "whole_total_available", "severity": "info", "message": "The source publishes the total of every official donor as official donors (DAC); a sum of the listed donors includes private donors and differs from it.", - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "params": { "total": "DACOfficialDonors", "total_label": "official donors (DAC)", @@ -98,33 +97,33 @@ } ], "timing_ms": { - "total": 657, + "total": 1038, "by_step": { - "recall": 118, + "recall": 534, "phase_resolve_places": 0, "phase_check_entities": 0, - "shape_arcs": 4, - "shape_probe_coverage": 7, - "shape_probe": 108, - "shape_groups": 8, + "shape_arcs": 3, + "shape_probe_coverage": 9, + "shape_probe": 104, + "shape_groups": 6, "shape_labels": 0, - "shape_admission": 3, + "shape_admission": 2, "phase_derive_shapes": 0, "shape_denominators": 0, - "shape_quantity": 97, + "shape_quantity": 79, "shape_rank": 4, - "shape": 235, + "shape": 207, "phase_prune_and_rank": 0, - "bind": 98, - "phase_bind": 19, - "phase_settle": 13, + "bind": 113, + "phase_bind": 14, + "phase_settle": 10, "phase_place_bindings": 1, "phase_facet_requests": 0, - "materialise": 43, - "phase_materialise": 5, - "answer": 24, - "options": 14, - "phase_outcome": 87 + "materialise": 38, + "phase_materialise": 4, + "answer": 16, + "options": 16, + "phase_outcome": 85 } }, "restatement": { @@ -179,10 +178,10 @@ ], "status": "definite", "spec": { - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "definition": { "schema_version": 1, - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "identity": { "identity_version": "spec1", "shape": { @@ -231,6 +230,12 @@ "start_year": 2022, "end_year": 2022 }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } + }, "open_roles": [ "origin" ] @@ -445,6 +450,7 @@ "member_count": 1, "member_count_exact": true, "served_count": 1, + "sums_components": true, "data_date_range": { "start": "2022", "end": "2022" @@ -465,20 +471,6 @@ "has_data": true, "observation_count": 111, "evidence": "facet_metadata", - "dimensions": [ - { - "label": "sources", - "count": 1 - }, - { - "label": "observations", - "count": 1 - }, - { - "label": "variables", - "count": 1 - } - ], "window": { "start_year": 2022, "end_year": 2022 @@ -506,30 +498,12 @@ "financingProvider": 111, "financingRecipient": 1 } - }, - { - "year": 2021, - "observations": 103, - "series": 103, - "role_counts": { - "financingProvider": 103, - "financingRecipient": 1 - } - }, - { - "year": 2020, - "observations": 92, - "series": 92, - "role_counts": { - "financingProvider": 92, - "financingRecipient": 1 - } } ] }, "download": { "rows": 111, - "rows_exact": true, + "rows_exact": false, "series": 111, "window": { "start_year": 2022, @@ -542,9 +516,9 @@ "coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "facets": { "provenance": { - "basis": "fallback", - "ref": "provenance/OECDDAC2A", - "label": "OECD DAC2A", + "basis": "bound", + "ref": "provenance/ONEDAC2aBilateral", + "label": "OECD DAC2a (bilateral flows)", "source": { "ref": "dc/s/OrganisationForEconomicCo-operationAndDevelopmentOecd", "label": "Organisation for Economic Co-operation and Development (OECD)" @@ -553,7 +527,6 @@ "id": "dfo", "label": "Development Finance Observatory" }, - "documentation": "/api/graph/documentation/provenance/OECDDAC2A", "account": "provider" }, "unit": { @@ -688,11 +661,11 @@ "source": "observed" } ], - "rendered_sentence": "Net disbursements to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", + "rendered_sentence": "Net disbursements (bilateral flows) to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -988,7 +961,7 @@ "start_year": 2022, "end_year": 2022 }, - "capability_version": "cap_b29a91445f7a4da3", + "capability_version": "cap_eed8849e3076f272", "default_reading": { "applied": true, "removed_stat_vars": [] @@ -997,7 +970,7 @@ "confidence": "high", "available_at_place": true, "alternative_measures": [], - "measure_label": "net disbursements", + "measure_label": "net disbursements (bilateral flows)", "measure_label_axes": [ "populationType", "measuredProperty", @@ -3001,10 +2974,10 @@ "deflation_basis": "donor" }, "scope_choices": { - "id": "spec_67170941f9982e1b0525932d4b816168", + "id": "spec_7073b80d69e5be87d1266cc2884d2620", "base": { "schema_version": 1, - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "identity": { "identity_version": "spec1", "shape": { @@ -3053,17 +3026,23 @@ "start_year": 2022, "end_year": 2022 }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } + }, "open_roles": [ "origin" ] } }, - "rule_version": "scope1:3eef00a928eedd463ee48d02b79730da", + "rule_version": "scope1:8fa547c2d7d0eaa55e822a30541be40b", "entries": [], "dropped_entries": [], "choices": [ { - "id": "spec_67170941f9982e1b0525932d4b816168:measure_basis", + "id": "spec_7073b80d69e5be87d1266cc2884d2620:measure_basis", "axis": "measure_basis", "rule": "measure_basis_convention", "provenance": "default", @@ -3131,7 +3110,7 @@ } ], "compiled": { - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "identity": { "identity_version": "spec1", "shape": { @@ -3180,13 +3159,27 @@ "start_year": 2022, "end_year": 2022 }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } + }, "open_roles": [ "origin" ] }, "components": [ { - "role": "whole", + "role": "bilateral", + "periods": [ + [ + 2022, + 2022 + ] + ], + "provenance": "provenance/OECDDAC2A", + "stat_vars": 1, "identity": { "identity_version": "spec1", "shape": { @@ -3248,11 +3241,11 @@ } } ], - "rendered_sentence": "Net disbursements to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. You asked for a ranking. This shows the amounts behind it, because Search does not compute rankings. Assumed: official development assistance.", + "rendered_sentence": "Net disbursements (bilateral flows) to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. You asked for a ranking. This shows the amounts behind it, because Search does not compute rankings. Assumed: official development assistance.", "sentence_plan": [ { "kind": "slot", - "text": "Net disbursements", + "text": "Net disbursements (bilateral flows)", "axis": "what", "segment": "heading", "entity_refs": [], @@ -3490,10 +3483,10 @@ "schema_version": 1, "input": { "kind": "spec_id", - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "definition": { "schema_version": 1, - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "identity": { "identity_version": "spec1", "shape": { @@ -3542,6 +3535,12 @@ "start_year": 2022, "end_year": 2022 }, + "facets": { + "provenance": { + "state": "value", + "ref": "provenance/ONEDAC2aBilateral" + } + }, "open_roles": [ "origin" ] @@ -3559,13 +3558,13 @@ "status": 200, "headers": { "content-type": "application/json", - "x-dfo-trace-id": "68c08955f3ee4e86b71742843339992b" + "x-dfo-trace-id": "059645aaf1f74fd8845c4f4943046cdd" }, "json": { "schema_version": 1, "definition": { "schema_version": 1, - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "identity": { "shape": { "kind": "statvar_schema", @@ -3603,6 +3602,12 @@ "property": "nettingBasis" } ], + "facets": { + "provenance": { + "ref": "provenance/ONEDAC2aBilateral", + "state": "value" + } + }, "entities": { "destination": [ "country/ETH" @@ -3619,8 +3624,8 @@ } } }, - "content_version": "cv_219fc5386675dcca1fc91197c39ac885", - "prepared_at": "2026-10-28T22:26:00Z", + "content_version": "cv_83d6022d7844f86a25aeb1bae4001686", + "prepared_at": "2026-11-15T21:48:06Z", "coverage": { "rows": 96, "dimensions": [ @@ -3678,8 +3683,8 @@ "source_data_url": "https://webfs-dcd.oecd.org/files/dotStat/DSD_DAC2/Table2a_Data.zip", "attribution": "OECD (2026), OECD DAC2A, OECD Data Explorer, https://webfs-dcd.oecd.org/files/dotStat/DSD_DAC2/Table2a_Data.zip (accessed on 2026-10-12)", "update_cadence": "Quarterly", - "last_update": "2026-10-15", - "years_covered": "1960-2024", + "last_update": "2026-10-29", + "years_covered": "1960-2025", "granularity": "Annual, by provider and recipient", "currencies": [ "USD" @@ -3690,8 +3695,8 @@ "description": "The OECD publishes DAC2A in April, June, September and December. The complete table is downloaded from the OECD each time it is republished, and replaces the previous copy, so the data reflects the OECD's latest release." }, { - "transformation": "Exclude the partial preliminary year", - "description": "Before each full release, the OECD publishes preliminary data for the year that release covers, as reporters submit it. Until then, that year is partial, so the pipeline excludes it. Support for partial years is in development. Partial years will be marked incomplete, so they don't lead to incorrect or confusing analyses." + "transformation": "Mark the partial year", + "description": "The OECD publishes data for a year as donors report it, and its final release in December of the following year covers every donor. Until then, the year is partial. The pipeline publishes it, and the import's provenance names it in `partialObservationDate`." }, { "transformation": "Standardise providers and recipients", @@ -3711,13 +3716,23 @@ } ], "version_history": [ + { + "date": "2026-10-29", + "title": "Partial year published, marked as partial", + "changes": [ + { + "kind": "changed", + "note": "The partial year, which only some donors have reported ahead of the OECD's final release in December, is included, and the import's provenance marks it with `partialObservationDate`." + } + ] + }, { "date": "2026-10-15", - "title": "Partial preliminary year excluded", + "title": "Partial year excluded", "changes": [ { "kind": "changed", - "note": "The partial preliminary year published ahead of the next full release is excluded." + "note": "The partial year, which only some donors have reported ahead of the OECD's final release in December, is excluded." } ] }, @@ -3743,7 +3758,7 @@ "party_totals_left_out": [ { "role": "financingProvider", - "provenance": "provenance/OECDDAC2A", + "provenance": "provenance/ONEDAC2aBilateral", "entities": [ "AfricanDevelopmentBankGroup", "DACCountriesTotal", @@ -3765,13 +3780,13 @@ ], "facets": [ { - "ref": "provenance/OECDDAC2A", + "ref": "provenance/ONEDAC2aBilateral", "axis": "provenance", - "basis": "deployment_fallback", - "default_policy": "dfo/facet-policy/most-observations", - "selection_reason": "sole_candidate", - "dispatch_facet_id": "1962969911839422253", - "default_policy_version": "1" + "basis": "bound", + "default_policy": null, + "selection_reason": "the composite OECD DAC2a", + "dispatch_facet_id": "provenance/ONEDAC2aBilateral", + "default_policy_version": null }, { "ref": null, @@ -3792,27 +3807,76 @@ "default_policy_version": "1" } ], + "components": [ + { + "role": "bilateral", + "rows": 111, + "facets": [ + { + "ref": "provenance/OECDDAC2A", + "axis": "provenance", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": null, + "axis": "measurementMethod", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "absent_on_selected_facet", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + }, + { + "ref": "CurrencyUSD", + "axis": "unit", + "basis": "deployment_fallback", + "default_policy": "dfo/facet-policy/most-observations", + "selection_reason": "sole_candidate", + "dispatch_facet_id": "1962969911839422253", + "default_policy_version": "1" + } + ], + "periods": [ + [ + 2022, + 2022 + ] + ], + "warnings": [], + "stat_vars": [ + "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal" + ], + "zero_rows": 0, + "provenance": "provenance/OECDDAC2A", + "dropped_years": [], + "content_version": "cv_fa2ff57f84808be46db4f606c25194eb" + } + ], "applied_window": { "kind": "range", "origin": "query", "end_year": 2022, "start_year": 2022 }, - "graph_revision": "dfo-dev-dc-datacommons-service-00275-9t9", + "graph_revision": "dfo-dev-dc-datacommons-service-00292-njf", "normalisations": [], "code_index_stamp": { - "exported_at": "2026-10-28T17:28:18Z", - "content_hash": "3d946d8f4986dbbe0fa3e5c4c917200381f529d89ce417c11daeb22df56eed99", + "exported_at": "2026-11-12T22:30:30Z", + "content_hash": "68c74212b6a5f923d3543f7bb04f7b791c28b62bfccd3d073ab03bfcb50216da", "graph_endpoint": "graph_release" }, "source_revisions": [ { "source": "provenance/OECDDAC2A", - "revision": "2026-10-15" + "revision": "2026-10-29" } ], - "capability_version": "dset_4c514fc1069d2b93", - "materialiser_build": "972c58bef62fbfc8baad54f8473fe465779025b0", + "capability_version": "dset_af2827aa39ed8c0d", + "materialiser_build": "7af2d8dd04797724b716496aea8182590a1a26d0", "resolved_stat_vars": [ { "ref": "dcid:Amount_FinancialFlow_Net_Disbursement_DAC2aAidType206_Nominal", @@ -3823,12 +3887,12 @@ "observation_count": 111 } ], - "family_member_count": 1, - "family_member_digest": "c2d373442ac21a31377df76cd343f156c72a530649757c399c6661cbf56c9a71", - "frame_grammar_version": "1.1.0", - "origin_catalogue_build_id": "20261027T131516Z-80bb1497", + "family_member_count": null, + "family_member_digest": null, + "frame_grammar_version": "1.2.0", + "origin_catalogue_build_id": "20261112T214518Z-14095471", "served_from": "head", - "confirmed_at": "2026-11-14T13:58:32.221920+00:00" + "confirmed_at": "2026-11-15T21:48:07.252195+00:00" }, "warnings": [], "diagnostics": [ @@ -3840,30 +3904,30 @@ ], "artifacts": [ { - "artifact_digest": "sha256:89fdd6dc3600cd739f88cdf8d948aab75c11754ef3c244cddcc1daed31bab64b", + "artifact_digest": "sha256:39b871975ebdd688fce8245c91a07fe9db98ea98c5d8bba7fa735a1f47d609ff", "rendering": { "bundle": false, "format": "parquet", "layout": 4, "without_party_totals": true }, - "bytes": 10345, + "bytes": 10245, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-10-28T22:26:00.878026+00:00", + "created_at": "2026-11-15T21:48:07.174687+00:00", "tier": "working", - "url": "/api/datasets/spec_67170941f9982e1b0525932d4b816168/cv_219fc5386675dcca1fc91197c39ac885/files/sha256:89fdd6dc3600cd739f88cdf8d948aab75c11754ef3c244cddcc1daed31bab64b", + "url": "/api/datasets/spec_7073b80d69e5be87d1266cc2884d2620/cv_83d6022d7844f86a25aeb1bae4001686/files/sha256:39b871975ebdd688fce8245c91a07fe9db98ea98c5d8bba7fa735a1f47d609ff", "enrichment_stamp": "55887b871f7aa1c5d120cb2bee97086605351d5acfbec645ab027f562d0f65c5" }, { - "artifact_digest": "sha256:f34567332e3a45cb8357bd587f254a3126f03f085e2fdc32afb1ec54e068fe01", + "artifact_digest": "sha256:fc5563d59a975162a304c38507f56fff7f949497721621d4b563a7fa7d0b058e", "rendering": { "statistics": "series" }, - "bytes": 9569, + "bytes": 9611, "media_type": "application/vnd.apache.parquet", - "created_at": "2026-10-28T22:26:00.878026+00:00", + "created_at": "2026-11-15T21:48:07.174687+00:00", "tier": "working", - "url": "/api/datasets/spec_67170941f9982e1b0525932d4b816168/cv_219fc5386675dcca1fc91197c39ac885/files/sha256:f34567332e3a45cb8357bd587f254a3126f03f085e2fdc32afb1ec54e068fe01" + "url": "/api/datasets/spec_7073b80d69e5be87d1266cc2884d2620/cv_83d6022d7844f86a25aeb1bae4001686/files/sha256:fc5563d59a975162a304c38507f56fff7f949497721621d4b563a7fa7d0b058e" } ], "series_count": 96, @@ -4239,7 +4303,7 @@ "series_coverage_stamp": "2ccb4207be7e12f0a536535864d13ad9c840110bf9e82085dff4625037ed346b", "retention": { "pinned": false, - "held_until": "2026-11-27T22:26:00.878555Z" + "held_until": "2026-12-15T21:48:07.175252Z" } } } @@ -4247,21 +4311,21 @@ { "request": { "method": "GET", - "origin_path": "/api/datasets/spec_67170941f9982e1b0525932d4b816168/cv_219fc5386675dcca1fc91197c39ac885/files/sha256:89fdd6dc3600cd739f88cdf8d948aab75c11754ef3c244cddcc1daed31bab64b" + "origin_path": "/api/datasets/spec_7073b80d69e5be87d1266cc2884d2620/cv_83d6022d7844f86a25aeb1bae4001686/files/sha256:39b871975ebdd688fce8245c91a07fe9db98ea98c5d8bba7fa735a1f47d609ff" }, "response": { "status": 302, "headers": { "content-type": "text/html", - "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A89fdd6dc3600cd739f88cdf8d948aab75c11754ef3c244cddcc1daed31bab64b?X-Goog-Signature=redacted", - "x-dfo-trace-id": "1c43512c52bf452a81281ce87ca6b6cb" + "location": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A39b871975ebdd688fce8245c91a07fe9db98ea98c5d8bba7fa735a1f47d609ff?X-Goog-Signature=redacted", + "x-dfo-trace-id": "0f69a32af8e04576b10ececcd2e6bbcd" } } }, { "request": { "method": "GET", - "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A89fdd6dc3600cd739f88cdf8d948aab75c11754ef3c244cddcc1daed31bab64b?X-Goog-Signature=redacted" + "url": "https://storage.googleapis.com/dev-fin-observatory-datasets-working/sha256%3A39b871975ebdd688fce8245c91a07fe9db98ea98c5d8bba7fa735a1f47d609ff?X-Goog-Signature=redacted" }, "response": { "status": 200, @@ -4277,10 +4341,10 @@ "answer": { "kind": "resolution", "status": "definite", - "sentence": "Net disbursements to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. You asked for a ranking. This shows the amounts behind it, because Search does not compute rankings. Assumed: official development assistance.", + "sentence": "Net disbursements (bilateral flows) to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a. You asked for a ranking. This shows the amounts behind it, because Search does not compute rankings. Assumed: official development assistance.", "complete": true, "specs": [ - "spec_67170941f9982e1b0525932d4b816168" + "spec_7073b80d69e5be87d1266cc2884d2620" ], "gaps": [] } @@ -4289,7 +4353,7 @@ "error": { "class": "SearchWarning", "code": null, - "trace_id": "26dd51cbb8fb4abca105349fa3a7ee1f" + "trace_id": "b2223c5802ee4772bdbcbc0f963bc3b9" } }, { @@ -4301,13 +4365,12 @@ "financingRecipient_label", "value", "unit_label", - "dac2aAidType_label", "provenance_label", "financingProvider", "financingProvider_kind", + "stat_var_label", "financingRecipient", "financingRecipient_kind", - "dac2aAidType", "unit", "currency", "price_basis", @@ -4323,15 +4386,15 @@ "parts": [ "aid" ], - "spec_id": "spec_67170941f9982e1b0525932d4b816168", - "content_version": "cv_219fc5386675dcca1fc91197c39ac885", - "sentence": "Net disbursements to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a." + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", + "content_version": "cv_83d6022d7844f86a25aeb1bae4001686", + "sentence": "Net disbursements (bilateral flows) to Ethiopia from 96 providers for official development assistance in 2022. Current US dollars · OECD DAC2a." } ], "missing": [], "party_totals_left_out": [ { - "spec_id": "spec_67170941f9982e1b0525932d4b816168", + "spec_id": "spec_7073b80d69e5be87d1266cc2884d2620", "role": "financingProvider", "entities": [ "AfricanDevelopmentBankGroup", @@ -4350,7 +4413,7 @@ "PostcodeLotteryGroup", "WorldBankGroup" ], - "provenance": "provenance/OECDDAC2A" + "provenance": "provenance/ONEDAC2aBilateral" } ], "search_warning": true diff --git a/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.parquet b/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.parquet index dd4bcb0..9003b0f 100644 Binary files a/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.parquet and b/python/client-contract/src/dfo_client_contract/scenarios/search-warning-top5.parquet differ diff --git a/python/client-contract/src/dfo_client_contract/served/SOURCE.json b/python/client-contract/src/dfo_client_contract/served/SOURCE.json index 7ae342c..6ff64e6 100644 --- a/python/client-contract/src/dfo_client_contract/served/SOURCE.json +++ b/python/client-contract/src/dfo_client_contract/served/SOURCE.json @@ -1,6 +1,6 @@ { "format_version": 1, "repository": "DevelopmentFinanceObservatory/apis", - "commit": "aacbe6a4ab961d30f774cf89cacb0210e1280655", + "commit": "7af2d8dd04797724b716496aea8182590a1a26d0", "captured_from": "dfo_apis.app.create_app() in process" } diff --git a/python/client-contract/src/dfo_client_contract/served/openapi.json b/python/client-contract/src/dfo_client_contract/served/openapi.json index b58f271..a5ba385 100644 --- a/python/client-contract/src/dfo_client_contract/served/openapi.json +++ b/python/client-contract/src/dfo_client_contract/served/openapi.json @@ -165,13 +165,13 @@ } } }, - "/api/search/schema": { + "/api/search/json-schema": { "get": { "tags": [ "Search" ], - "summary": "Get Schema", - "operationId": "search_get_schema", + "summary": "Get Json Schema", + "operationId": "search_get_json_schema", "responses": { "200": { "description": "Successful Response", @@ -344,13 +344,13 @@ } } }, - "/api/datasets/schema": { + "/api/datasets/json-schema": { "get": { "tags": [ "Datasets" ], - "summary": "Get Schema", - "operationId": "datasets_get_schema", + "summary": "Get Json Schema", + "operationId": "datasets_get_json_schema", "responses": { "200": { "description": "Successful Response", @@ -2318,20 +2318,20 @@ } } }, - "/api/graph/schema": { + "/api/graph/json-schema": { "get": { "tags": [ "Graph" ], - "summary": "Get Schema", - "operationId": "graph_get_schema", + "summary": "Get Json Schema", + "operationId": "graph_get_json_schema", "responses": { "200": { "description": "Successful Response", "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GraphSchema" + "$ref": "#/components/schemas/GraphJsonSchema" } } } @@ -2483,6 +2483,150 @@ } } }, + "/api/graph/schema": { + "get": { + "tags": [ + "Graph" + ], + "summary": "Get Schema", + "operationId": "graph_get_schema", + "responses": { + "200": { + "description": "Successful Response", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SchemaDocument" + } + } + } + }, + "default": { + "description": "any non-2xx response uses this envelope", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/graph/schema/terms": { + "get": { + "tags": [ + "Graph" + ], + "summary": "Get Schema Terms", + "operationId": "graph_get_schema_terms", + "responses": { + "200": { + "description": "Successful Response", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SchemaTerms" + } + } + } + }, + "default": { + "description": "any non-2xx response uses this envelope", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/graph/schema/usage": { + "get": { + "tags": [ + "Graph" + ], + "summary": "Get Schema Usage", + "operationId": "graph_get_schema_usage", + "responses": { + "200": { + "description": "Successful Response", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/DatasetUsage" + } + } + } + }, + "default": { + "description": "any non-2xx response uses this envelope", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/graph/schema/check": { + "post": { + "tags": [ + "Graph" + ], + "summary": "Post Schema Check", + "operationId": "graph_post_schema_check", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SchemaCheckRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "Successful Response", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SchemaCheckResponse" + } + } + } + }, + "default": { + "description": "any non-2xx response uses this envelope", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "400": { + "description": "the request body or parameters failed validation (request_invalid)", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, "/api/graph/node/{dcid}/members": { "get": { "tags": [ @@ -5760,7 +5904,7 @@ }, "type": "array", "title": "Departures", - "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" + "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, core_contribution_read, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" }, "assumptions": { "items": { @@ -5818,7 +5962,7 @@ "additionalProperties": true, "type": "object", "title": "Identity", - "description": "the identity-core document, shaped as search.models.identity.BaseIdentity and published at GET /api/search/schema" + "description": "the identity-core document, shaped as search.models.identity.BaseIdentity and published at GET /api/search/json-schema" } }, "additionalProperties": false, @@ -7452,6 +7596,30 @@ "title": "GraphDefinitionConstraint", "description": "One constraint: the property and the value the variable fixes it at." }, + "ConstraintValue": { + "anyOf": [ + { + "type": "string", + "maxLength": 512 + }, + { + "type": "integer", + "maximum": 9007199254740992.0, + "minimum": -9007199254740992.0 + }, + { + "type": "number", + "ge": -9007199254740992, + "le": 9007199254740992 + }, + { + "type": "boolean" + }, + { + "type": "null" + } + ] + }, "ContinentNode": { "properties": { "ref": { @@ -8836,6 +9004,24 @@ "title": "DatasetRoot", "description": "A dataset version, as a ref member names it." }, + "DatasetUsage": { + "properties": { + "provenances": { + "items": { + "$ref": "#/components/schemas/ProvenanceUsage" + }, + "type": "array", + "title": "Provenances", + "description": "sorted by ref" + } + }, + "type": "object", + "required": [ + "provenances" + ], + "title": "DatasetUsage", + "description": "How each Provenance of the code index uses the model." + }, "DatasetVersion": { "properties": { "content_version": { @@ -8991,6 +9177,14 @@ "title": "DateRange", "description": "The first and last dates of the points an answer serves for a StatVar." }, + "DeclaredBy": { + "type": "string", + "enum": [ + "dfo", + "base", + "un_system" + ] + }, "DeclinedAnswer": { "properties": { "schema_version": { @@ -9140,7 +9334,7 @@ }, "type": "array", "title": "Departures", - "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" + "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, core_contribution_read, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" }, "assumptions": { "items": { @@ -9208,7 +9402,7 @@ "additionalProperties": true, "type": "object", "title": "Identity", - "description": "the identity-core document, shaped as search.models.identity.BaseIdentity and published at GET /api/search/schema" + "description": "the identity-core document, shaped as search.models.identity.BaseIdentity and published at GET /api/search/json-schema" } }, "additionalProperties": false, @@ -9300,10 +9494,11 @@ "organisation_read_as_source", "direction_inferred", "organisation_read_as_party", + "core_contribution_read", "scope_limited" ], "title": "Code", - "description": "what kind of departure this is. 'closest_match': the answer shows the nearest measure the graph holds, not the one asked; a client draws a muted 'Closest match:' lead before the heading, and on a candidates part, whose readings stand in for a measure with no data, once before the first reading. 'measure_not_applied': a named measure qualifier was not applied. 'operation_not_applied': an operation the request named (a share, a ranking) was not run, so the amounts behind it are shown. 'breakdown_not_applied': a breakdown the request named was not applied, so the total is shown. 'entity_unavailable': an entity the request named holds no values in the series the answer reads, one departure per role; for a role the request named as a group, asked is the request's words for the group and the text counts the members without values; the text names any source holding values there that Search does not read. 'member_unavailable': a variable of the answer holds no values under the source, unit and method a reading reads, so it shows none; asked names those variables and shown the source read, and the text names that source and its unit, so each reading of a candidates part states its own; editing the source or the set binding that names the variables clears it. 'year_unavailable': a named year or range falls outside the years served. 'modelled_values': the served values are modelled or estimated. 'group_read_as_members': a named group was read as its member entities; on a flow role the text names the amounts the group's published total counts that no member holds, and, for a group whose published total is not its members' sum, says the source publishes its own figure for the group. 'whole_total_read': a flow side is read as its whole population, the total its source publishes for every party of that side (official donors (DAC) for 'official donors' or a donor side the request named nothing on or summed over; official and private donors (DAC) for 'all donors'); the text says what the total holds and how to list the side's members: in the question's words ('by donor') on the raw_text door, with open_roles on the others. 'whole_total_unpublished': the request named a whole population ('all donors', 'all recipients') on a side whose dataset publishes no total of it and holds no party outside it, so the side is left unnamed and the answer covers every party the dataset holds there; asked is the request's words, and the text names the dataset. 'direction_discarded': a flow direction the request's own words named was not applied. 'organisation_read_as_source': an organisation the request named as a party to a flow, on an answer whose series has flow roles, is read as the source of the data, since the data that best matches the question does not list it as a party to a flow; asked is the request's words for it. 'direction_inferred': a place the request named without a direction is read on one direction, which over names, for one of four reasons: an operation runs over the other direction, a place the request named with a direction stands on the other and data holds the place on this one, only this direction holds data in the years asked, or a dataset lists the place among its providers, which the text names. 'organisation_read_as_party': an organisation the request named is read as a party to the flow, because the request named it as a party where it could also be the source, because another source the request named lists it as a party, because its words name no single source, or because none of the data it publishes measures what the request asked; asked is the request's words for it, and the text says which reason. 'scope_limited': a no_data answer's check covered only values the engine chose, which the request did not name; its text names only what the check covered ('This check covered only ODA.')" + "description": "what kind of departure this is. 'closest_match': the answer shows the nearest measure the graph holds, not the one asked; a client draws a muted 'Closest match:' lead before the heading, and on a candidates part, whose readings stand in for a measure with no data, once before the first reading. 'measure_not_applied': a named measure qualifier was not applied. 'operation_not_applied': an operation the request named (a share, a ranking) was not run, so the amounts behind it are shown. 'breakdown_not_applied': a breakdown the request named was not applied, so the total is shown. 'entity_unavailable': an entity the request named holds no values in the series the answer reads, one departure per role; for a role the request named as a group, asked is the request's words for the group and the text counts the members without values; the text names any source holding values there that Search does not read. 'member_unavailable': a variable of the answer holds no values under the source, unit and method a reading reads, so it shows none; asked names those variables and shown the source read, and the text names that source and its unit, so each reading of a candidates part states its own; editing the source or the set binding that names the variables clears it. 'year_unavailable': a named year or range falls outside the years served. 'modelled_values': the served values are modelled or estimated. 'group_read_as_members': a named group was read as its member entities; on a flow role the text names the amounts the group's published total counts that no member holds, and, for a group whose published total is not its members' sum, says the source publishes its own figure for the group. 'whole_total_read': a flow side is read as its whole population, the total its source publishes for every party of that side (official donors (DAC) for 'official donors' or a donor side the request named nothing on or summed over; official and private donors (DAC) for 'all donors'); the text says what the total holds and how to list the side's members: in the question's words ('by donor') on the raw_text door, with open_roles on the others. 'whole_total_unpublished': the request named a whole population ('all donors', 'all recipients') on a side whose dataset publishes no total of it and holds no party outside it, so the side is left unnamed and the answer covers every party the dataset holds there; asked is the request's words, and the text names the dataset. 'direction_discarded': a flow direction the request's own words named was not applied. 'organisation_read_as_source': an organisation the request named as a party to a flow, on an answer whose series has flow roles, is read as the source of the data, since the data that best matches the question does not list it as a party to a flow; asked is the request's words for it. 'direction_inferred': a place the request named without a direction is read on one direction, which over names, for one of four reasons: an operation runs over the other direction, a place the request named with a direction stands on the other and data holds the place on this one, only this direction holds data in the years asked, or a dataset lists the place among its providers, which the text names. 'organisation_read_as_party': an organisation the request named is read as a party to the flow, because the request named it as a party where it could also be the source, because another source the request named lists it as a party, because its words name no single source, or because none of the data it publishes measures what the request asked; asked is the request's words for it, and the text says which reason. 'core_contribution_read': the answer names a multilateral organisation as the recipient, so its figures are the donor's core contributions to it, which total ODA counts and a bilateral reading leaves out; shown is the organisation's name. 'scope_limited': a no_data answer's check covered only values the engine chose, which the request did not name; its text names only what the check covered ('This check covered only ODA.')" }, "binding_ref": { "anyOf": [ @@ -11575,29 +11770,7 @@ "title": "Freshness", "description": "A source's own refresh cadence, read from DCP provenance arcs that imports populate\nunevenly: `dc/base/WHO_COVID19` carries both `sourceReleaseFrequency` and\n`automaticRefreshType`, `dc/base/BIS_CentralBankPolicyRate` only the second, and\n`dc/base/WHO_GHO` neither. Nullability is the contract.\n\n`release_frequency` is the raw `sourceReleaseFrequency` ISO 8601 duration (`P1M`);\n`release_frequency_label` is `materialise.cadence.cadence_label`'s display label for it\n(`Monthly`), or the raw token when that module does not recognise it.\n\n`refresh_type` is `automaticRefreshType`'s value: how this deployment refreshes the\nsource, such as `GCPCloudRunAutomaticRefresh`, or the sentinel `NoAutomaticRefresh`." }, - "GraphRef": { - "properties": { - "ref": { - "type": "string", - "title": "Ref", - "description": "the graph identifier" - }, - "label": { - "type": "string", - "title": "Label", - "description": "plain-language display name, read from the graph" - } - }, - "additionalProperties": false, - "type": "object", - "required": [ - "ref", - "label" - ], - "title": "GraphRef", - "description": "Every graph identifier in the contract." - }, - "GraphSchema": { + "GraphJsonSchema": { "properties": { "schemas": { "additionalProperties": { @@ -11619,8 +11792,30 @@ "schemas", "capabilities" ], - "title": "GraphSchema", - "description": "The full `GET /api/graph/schema` document." + "title": "GraphJsonSchema", + "description": "The full `GET /api/graph/json-schema` document." + }, + "GraphRef": { + "properties": { + "ref": { + "type": "string", + "title": "Ref", + "description": "the graph identifier" + }, + "label": { + "type": "string", + "title": "Label", + "description": "plain-language display name, read from the graph" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "ref", + "label" + ], + "title": "GraphRef", + "description": "Every graph identifier in the contract." }, "GroupNode": { "properties": { @@ -13713,7 +13908,7 @@ }, "type": "array", "title": "Departures", - "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" + "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, core_contribution_read, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" }, "assumptions": { "items": { @@ -14549,7 +14744,8 @@ "carried_choice_not_applied", "stated_choice_not_applied", "option_not_covered", - "contributions_counted" + "contributions_counted", + "multilateral_destination" ] }, { @@ -14565,7 +14761,7 @@ }, "type": "object", "title": "Detail", - "description": "the code's parameters: `why` for provider_not_offered, `dataset` for basis_not_published and contributions_counted, `entry` and `cause` for conflicts_with" + "description": "the code's parameters: `why` for provider_not_offered, with `slot`, the property at fault, where why is slot_not_served, and `pointer`, the identity member at fault, where why is composite_not_servable, `dataset` for basis_not_published and contributions_counted, `destination` for multilateral_destination, the multilateral agency the part names as recipient, whose flows are core contributions, `entry` and `cause` for conflicts_with" } }, "additionalProperties": false, @@ -16107,48 +16303,26 @@ "title": "ProvenanceRef", "description": "A provenance on the wire: its dcid and label, the source behind it, the\nData Commons its data comes from, and the route of its document, which\nfollows from the dcid. `label`, `source` and `data_commons` come from the\norigin catalogue's provenance table. A provenance the table does not list\ncarries its graph label and neither `source` nor `data_commons`, and is\nomitted when the graph has no label for it." }, - "ProviderBinding": { + "ProvenanceUsage": { "properties": { - "kind": { - "type": "string", - "const": "provider", - "title": "Kind", - "default": "provider" - }, - "scope": { + "ref": { "type": "string", - "enum": [ - "bilateral", - "inclusive", - "contributions", - "multilateral" - ], - "title": "Scope", - "description": "bilateral flows alone, with imputed shares of multilateral spending, with core contributions to multilaterals, or the core contributions alone, as a published donor total counts them" + "title": "Ref", + "description": "the Provenance's dcid" }, - "window": { + "label": { "anyOf": [ { - "prefixItems": [ - { - "type": "integer" - }, - { - "type": "integer" - } - ], - "type": "array", - "maxItems": 2, - "minItems": 2 + "type": "string" }, { "type": "null" } ], - "title": "Window", - "description": "the years the option sets as the requested window, first and last: the latest run of years both tables of the inclusive scope cover, when they cover fewer than the part asks for, or the one latest year both cover for a part asking for the latest year; None when the option keeps the part's window" + "title": "Label", + "description": "the Provenance node's name in the graph; null when it has none" }, - "provenance": { + "description": { "anyOf": [ { "type": "string" @@ -16157,15 +16331,106 @@ "type": "null" } ], - "title": "Provenance", - "description": "the composite provenance the inclusive scope binds as the identity's source, which stacks the part's bilateral flows on the imputed multilateral line of its own table; None for every other scope" - } - }, - "additionalProperties": false, - "type": "object", - "required": [ - "scope" - ], + "title": "Description", + "description": "the Provenance node's description in the graph; null when it has none" + }, + "stat_var_count": { + "type": "integer", + "title": "Stat Var Count" + }, + "patterns": { + "items": { + "$ref": "#/components/schemas/SchemaPattern" + }, + "type": "array", + "title": "Patterns", + "description": "sorted by StatVar count descending, then by the pattern's fields" + }, + "constraint_values": { + "items": { + "$ref": "#/components/schemas/SchemaConstraintValues" + }, + "type": "array", + "title": "Constraint Values", + "description": "one entry per constraint property the StatVars set, sorted by property" + }, + "facets": { + "$ref": "#/components/schemas/SchemaFacets", + "description": "facts of the coverage facets; empty lists when coverage holds none" + } + }, + "type": "object", + "required": [ + "ref", + "label", + "description", + "stat_var_count", + "patterns", + "constraint_values", + "facets" + ], + "title": "ProvenanceUsage", + "description": "How one Provenance's StatVars use the model." + }, + "ProviderBinding": { + "properties": { + "kind": { + "type": "string", + "const": "provider", + "title": "Kind", + "default": "provider" + }, + "scope": { + "type": "string", + "enum": [ + "bilateral", + "inclusive", + "contributions", + "multilateral" + ], + "title": "Scope", + "description": "bilateral flows alone, with imputed shares of multilateral spending, with core contributions to multilaterals, or the core contributions alone, as a published donor total counts them" + }, + "window": { + "anyOf": [ + { + "prefixItems": [ + { + "type": "integer" + }, + { + "type": "integer" + } + ], + "type": "array", + "maxItems": 2, + "minItems": 2 + }, + { + "type": "null" + } + ], + "title": "Window", + "description": "the years the option sets as the requested window, first and last: the latest run of years both tables of the inclusive scope cover, when they cover fewer than the part asks for, or the one latest year both cover for a part asking for the latest year; None when the option keeps the part's window" + }, + "provenance": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Provenance", + "description": "the composite provenance the option binds as the identity's source: for the inclusive scope, the part's bilateral flows stacked on the imputed multilateral line of its own table; for the bilateral scope on DAC2a's total ODA, its bilateral destinations alone; None for every other option" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "scope" + ], "title": "ProviderBinding", "description": "An option that sets whose spending the answer counts." }, @@ -18358,7 +18623,7 @@ "type": "null" } ], - "description": "how the part this Spec answers was counted: one ScopeChoice per axis a declared rule or the request settled (sector, region, measure basis, provider scope), with its options and their availability, the explicit and carried entries applied, and the identity they compile to (see PartScope). To switch an option, post base.identity as identity on a dataset_resubmit identity entry, with entries as scope_entries, the entry on the switched axis replaced by the switch: one entry per axis. None when no axis was settled and no scope entries were posted. Never a member of BaseIdentity, never hashed." + "description": "how the part this Spec answers was counted: one ScopeChoice per axis a declared rule or the request settled (sector, region, measure basis, provider scope), with its options and their availability, the explicit and carried entries applied, and the identity they compile to (see PartScope). To switch an option, post base.identity as identity on a dataset_resubmit identity entry, with entries as scope_entries, the entry on the switched axis replaced by the switch: one entry per axis. Empty choices when no axis was settled but the part is served from a composite, which compiled.identity and compiled.components name (a DAC2a ranking read to its bilateral destinations). None when no axis was settled, no composite serves the part and no scope entries were posted. Never a member of BaseIdentity, never hashed." } }, "additionalProperties": false, @@ -18779,86 +19044,853 @@ "title": "Pinned", "description": "whether the frame the version's files render from is in the pinned tier, which has no expiry" }, - "held_until": { + "held_until": { + "anyOf": [ + { + "type": "string", + "format": "date-time" + }, + { + "type": "null" + } + ], + "title": "Held Until", + "description": "when the working-tier frame stops being guaranteed, 30 days after it was stored. A download of the frame after `held_until`, while its bytes survive, renews it for 30 days. After it, a file selector or download link request that must render its file again renews the frame for 30 days if the frame's bytes survive, and otherwise refuses `artifact_expired`. A rebuild of unchanged data through `GET /api/datasets/{id}` or `POST /api/datasets` stores the frame again. Absent when pinned. It can be in the past" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "pinned" + ], + "title": "RetentionModel", + "description": "How long a version can still be fetched, which `datasets_api.retention` computes when a\ndoor serves the version. No stored body holds it." + }, + "RoleAxis": { + "type": "string", + "enum": [ + "origin", + "destination" + ] + }, + "RoleAxisFact": { + "properties": { + "role": { + "$ref": "#/components/schemas/RoleAxis", + "description": "which flow axis this fact is about" + }, + "member_count": { + "anyOf": [ + { + "type": "integer" + }, + { + "type": "null" + } + ], + "title": "Member Count", + "description": "how many entities this axis' open scope resolves to, leaving out the group totals the code index declares beside their members (party_kind total), as the default download leaves them out; a scope of totals alone counts them all. None when the count could not be established without a read this response chose not to make (e.g. a discovered opposite axis whose own role index was omitted after a cap trip); the fact still publishes in that case, naming the axis as open with an explicit unknown rather than staying silent about it" + }, + "members_available": { + "type": "boolean", + "title": "Members Available", + "description": "whether the member list this count summarises is itself known and could be enumerated (e.g. through entity_options or the options door), not just counted. False exactly when member_count is None" + }, + "holds_multilaterals": { + "anyOf": [ + { + "type": "boolean" + }, + { + "type": "null" + } + ], + "title": "Holds Multilaterals", + "description": "for the origin axis, whether its open population holds a multilateral organisation (see ResolvedEntity.multilateral), read from the member list where it is known and otherwise from the parties the served datasets publish on the axis: true for the CRS's donors. Absent for the destination axis" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "role", + "member_count", + "members_available" + ], + "title": "RoleAxisFact", + "description": "One directional role axis (origin or destination) a role-bearing\nSpec's query left open, and what this Spec's own confirmation already\nknows about its member scope (see ResolvedSpec.role_axis_facts).\n\nUnlike OpenConstraintAxisFact, a role axis has no declared value of its\nown that could vary across served members -- the axis is a place a flow\nentity binds, not a constraint members assert -- so this carries no\nvaries/undeclared_count of its own; it carries only what a role axis\ngenuinely has: a population size and whether that population is known." + }, + "RootEntry": { + "properties": { + "ref": { + "type": "string", + "title": "Ref" + }, + "label": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Label" + }, + "count": { + "type": "integer", + "title": "Count", + "description": "codes for a code system, members under the default projection for a group or region, Datasets for a source" + } + }, + "type": "object", + "required": [ + "ref", + "label", + "count" + ], + "title": "GraphRootEntry", + "description": "A place to start listing from, with the length of its list." + }, + "RootRendering": { + "properties": { + "without_party_totals": { + "type": "boolean", + "title": "Without Party Totals", + "description": "Deprecated: use party_totals. true leaves group totals out, as party_totals: false does" + }, + "party_totals": { + "type": "boolean", + "title": "Party Totals", + "description": "Whether group totals stay in the frame. This is the preferred name of the party-totals cut. Absent, totals stay, unless without_party_totals is true. false leaves out the rows whose party, on a flow party role the identity binds no entity on, the code index declares a group total. It equals without_party_totals: true. Both may be given when they agree. The cut is recorded and served as without_party_totals" + }, + "columns": { + "anyOf": [ + { + "items": { + "type": "string", + "maxLength": 200, + "minLength": 1 + }, + "type": "array", + "maxItems": 32 + }, + { + "type": "null" + } + ], + "title": "Columns" + }, + "groupby": { + "anyOf": [ + { + "$ref": "#/components/schemas/GroupbyOptions" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "title": "RootRendering", + "description": "How a dataset root's frame is read. `columns` left out takes the enrichment its\ndataset's roles need (`default_enrichment`); `[]` reads the stored frame\nalone. `groupby` reads the frame summed as a mint with that `options.groupby` sums it." + }, + "Roots": { + "properties": { + "code_systems": { + "items": { + "$ref": "#/components/schemas/RootEntry" + }, + "type": "array", + "title": "Code Systems" + }, + "groups": { + "items": { + "$ref": "#/components/schemas/RootEntry" + }, + "type": "array", + "title": "Groups" + }, + "regions": { + "items": { + "$ref": "#/components/schemas/RootEntry" + }, + "type": "array", + "title": "Regions" + }, + "sources": { + "items": { + "$ref": "#/components/schemas/RootEntry" + }, + "type": "array", + "title": "Sources" + }, + "built_from": { + "additionalProperties": { + "type": "string" + }, + "propertyNames": { + "enum": [ + "code_index", + "origin_catalogue", + "coverage_index", + "membership" + ] + }, + "type": "object", + "title": "Built From", + "description": "the build of each table the document read" + } + }, + "type": "object", + "required": [ + "code_systems", + "groups", + "regions", + "sources", + "built_from" + ], + "title": "GraphRoots", + "description": "`GET /api/graph/roots`: where to start listing. Each list is ordered by dcid." + }, + "SchemaCheckRequest": { + "properties": { + "rows": { + "items": { + "$ref": "#/components/schemas/SchemaCheckRow" + }, + "type": "array", + "maxItems": 2000, + "minItems": 1, + "title": "Rows" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "rows" + ], + "title": "GraphSchemaCheckRequest", + "description": "`rows`: 1 to `CHECK_MAX_ROWS` candidate StatVar definitions, checked in order from the\nfirst." + }, + "SchemaCheckResponse": { + "properties": { + "generation": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Generation", + "description": "the graph generation the rows were checked against; null when unknown" + }, + "rows_checked": { + "type": "integer", + "title": "Rows Checked", + "description": "how many rows were checked, counted from the first row of the request; at least 1. A caller resumes at this index when it is less than the rows sent" + }, + "findings": { + "items": { + "$ref": "#/components/schemas/SchemaFinding" + }, + "type": "array", + "title": "Findings", + "description": "one finding per fault in the rows checked, in row order; empty when none of them has a fault" + } + }, + "type": "object", + "required": [ + "generation", + "rows_checked", + "findings" + ], + "title": "SchemaCheckResponse", + "description": "The findings over the rows one check took, from the first." + }, + "SchemaCheckRow": { + "properties": { + "dcid": { + "$ref": "#/components/schemas/_OptionalText", + "description": "the StatVar's dcid; when the code index serves it, the row is compared" + }, + "population_type": { + "$ref": "#/components/schemas/_OptionalText" + }, + "measured_property": { + "$ref": "#/components/schemas/_OptionalText", + "description": "absent or empty gets a `value_missing` finding" + }, + "stat_type": { + "$ref": "#/components/schemas/_OptionalText" + }, + "measurement_qualifier": { + "$ref": "#/components/schemas/_OptionalText" + }, + "measurement_denominator": { + "$ref": "#/components/schemas/_OptionalText" + }, + "constraint_properties": { + "additionalProperties": { + "$ref": "#/components/schemas/ConstraintValue" + }, + "propertyNames": { + "$ref": "#/components/schemas/_Text" + }, + "type": "object", + "maxProperties": 16, + "title": "Constraint Properties", + "description": "each constraint property and its value node; an empty value counts as null" + }, + "observation_properties": { + "items": { + "$ref": "#/components/schemas/_Text" + }, + "type": "array", + "maxItems": 4, + "title": "Observation Properties" + } + }, + "additionalProperties": false, + "type": "object", + "title": "GraphSchemaCheckRow", + "description": "A candidate StatisticalVariable definition. Each string is at most 512 characters, and\nan empty string counts as absent." + }, + "SchemaConstraintValues": { + "properties": { + "property": { + "type": "string", + "title": "Property" + }, + "values": { + "items": { + "$ref": "#/components/schemas/SchemaValueCount" + }, + "type": "array", + "title": "Values", + "description": "sorted by value" + } + }, + "type": "object", + "required": [ + "property", + "values" + ], + "title": "SchemaConstraintValues", + "description": "The values one constraint property takes over a Provenance's StatVars." + }, + "SchemaDocument": { + "properties": { + "generation": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Generation", + "description": "the graph generation the document was built from; null when unknown" + }, + "nodes": { + "items": { + "$ref": "#/components/schemas/SchemaNode" + }, + "type": "array", + "title": "Nodes" + } + }, + "type": "object", + "required": [ + "generation", + "nodes" + ], + "title": "SchemaDocument", + "description": "The deployment's model as one document." + }, + "SchemaFacets": { + "properties": { + "units": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Units" + }, + "scaling_factors": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Scaling Factors" + }, + "measurement_methods": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Measurement Methods" + }, + "observation_periods": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Observation Periods", + "description": "ISO 8601 durations, such as `P1Y`" + }, + "currencies": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Currencies", + "description": "ISO 4217 codes of the currency units" + } + }, + "type": "object", + "required": [ + "units", + "scaling_factors", + "measurement_methods", + "observation_periods", + "currencies" + ], + "title": "SchemaFacets", + "description": "The facet facts of a Provenance's coverage series, each list sorted and distinct." + }, + "SchemaFinding": { + "properties": { + "row": { + "type": "integer", + "title": "Row", + "description": "the row's index in the request's `rows`" + }, + "field": { + "type": "string", + "enum": [ + "dcid", + "population_type", + "measured_property", + "stat_type", + "measurement_qualifier", + "measurement_denominator", + "constraint_properties", + "observation_properties" + ], + "title": "Field", + "description": "the row member the finding is about" + }, + "property": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Property", + "description": "the constraint or observation property the finding is about; null for the other members" + }, + "subject": { + "type": "string", + "enum": [ + "property", + "value" + ], + "title": "Subject", + "description": "`property` when the finding judges a constraint or observation property itself, `value` otherwise" + }, + "value": { + "anyOf": [ + { + "$ref": "#/components/schemas/ConstraintValue" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "title": "Value", + "description": "what the row sent in the judged cell: the property's dcid when `subject` is `property`, a list for `observation_properties` on `definition_differs`, null where the row sent none" + }, + "served": { + "anyOf": [ + { + "$ref": "#/components/schemas/ConstraintValue" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "title": "Served", + "description": "for `definition_differs`, the value the code index serves (a sorted list for `observation_properties`, null where it serves none); null for every other code" + }, + "code": { + "type": "string", + "enum": [ + "node_not_held", + "not_a_node", + "node_provisional", + "node_untyped", + "origin_not_served", + "value_missing", + "not_a_property", + "not_a_class", + "value_outside_range", + "range_not_judged", + "property_outside_domain", + "definition_differs" + ], + "title": "Code" + }, + "severity": { + "type": "string", + "enum": [ + "error", + "warning" + ], + "title": "Severity" + } + }, + "type": "object", + "required": [ + "row", + "field", + "property", + "subject", + "value", + "served", + "code", + "severity" + ], + "title": "SchemaFinding", + "description": "One fault in one checked row." + }, + "SchemaInstances": { + "properties": { + "refs": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Refs", + "description": "the dcids of the instances listed, sorted" + }, + "complete": { + "type": "boolean", + "title": "Complete", + "description": "true when `refs` is every instance the graph holds: the class and each of its subclasses were listed from the graph and each listing read all of them; false when it holds some of them" + } + }, + "type": "object", + "required": [ + "refs", + "complete" + ], + "title": "SchemaInstances", + "description": "The nodes typed by a Class or by any of its subclasses." + }, + "SchemaLiteral": { + "properties": { + "value": { + "type": "string", + "title": "Value" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "value" + ], + "title": "SchemaLiteral", + "description": "A literal value as the graph holds it, a string even where it reads as a number, date or\nboolean." + }, + "SchemaNode": { + "properties": { + "ref": { + "type": "string", + "title": "Ref", + "description": "the node's dcid" + }, + "label": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Label", + "description": "the node's name; null when the graph gives none" + }, + "description": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Description", + "description": "the node's prose in the graph; null when it has none" + }, + "types": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Types", + "description": "the node's typeOf values" + }, + "alternate_name": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Alternate Name" + }, + "sub_class_of": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Sub Class Of" + }, + "sub_property_of": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Sub Property Of" + }, + "specialization_of": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Specialization Of" + }, + "domain_includes": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Domain Includes" + }, + "range_includes": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Range Includes" + }, + "classification_code": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Classification Code" + }, + "other_properties": { + "additionalProperties": { + "items": { + "anyOf": [ + { + "$ref": "#/components/schemas/SchemaNodeReference" + }, + { + "$ref": "#/components/schemas/SchemaLiteral" + } + ] + }, + "type": "array" + }, + "type": "object", + "title": "Other Properties", + "description": "every other outgoing property the graph holds on the node, by property dcid, sorted; the named members are a closed set, and a property promoted to one leaves this map. Each value has exactly one member, {ref: string} for a node or {value: string} for a literal, never parsed to a number or boolean, sorted by its text. A literal longer than 2,000 characters is left out, and a property keeps its first 100 values. {} when the node holds none" + }, + "provenances": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Provenances", + "description": "the Provenances declaring the node's typeOf arcs, verbatim, empty when declared_by is null" + }, + "declared_by": { "anyOf": [ { - "type": "string", - "format": "date-time" + "$ref": "#/components/schemas/DeclaredBy" }, { "type": "null" } ], - "title": "Held Until", - "description": "when the working-tier frame stops being guaranteed, 30 days after it was stored. A download of the frame after `held_until`, while its bytes survive, renews it for 30 days. After it, a file selector or download link request that must render its file again renews the frame for 30 days if the frame's bytes survive, and otherwise refuses `artifact_expired`. A rebuild of unchanged data through `GET /api/datasets/{id}` or `POST /api/datasets` stores the frame again. Absent when pinned. It can be in the past" + "description": "the origin declaring the node: dfo when any of its provenances is DFO's, base when every one is base Data Commons', un_system otherwise; null when the graph names no declaring Provenance for the node: it has no typeOf arc, or none of its typeOf targets carries one" + }, + "instances": { + "anyOf": [ + { + "$ref": "#/components/schemas/SchemaInstances" + }, + { + "type": "null" + } + ], + "description": "the nodes typed by the Class or any of its subclasses, on a DFO Class that descends from Enumeration or that a DFO property ranges on, a DFO subclass of one, or a base enumeration; null on every other node and on a Class whose list holds no node and is not complete" } }, - "additionalProperties": false, "type": "object", "required": [ - "pinned" + "ref", + "label", + "description", + "types", + "alternate_name", + "sub_class_of", + "sub_property_of", + "specialization_of", + "domain_includes", + "range_includes", + "classification_code", + "other_properties", + "provenances", + "declared_by", + "instances" ], - "title": "RetentionModel", - "description": "How long a version can still be fetched, which `datasets_api.retention` computes when a\ndoor serves the version. No stored body holds it." + "title": "SchemaNode", + "description": "One node of the schema document." }, - "RoleAxis": { - "type": "string", - "enum": [ - "origin", - "destination" - ] + "SchemaNodeReference": { + "properties": { + "ref": { + "type": "string", + "title": "Ref", + "description": "the node's dcid" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "ref" + ], + "title": "SchemaNodeReference", + "description": "A value that names a node of the graph, by its dcid." }, - "RoleAxisFact": { + "SchemaPattern": { "properties": { - "role": { - "$ref": "#/components/schemas/RoleAxis", - "description": "which flow axis this fact is about" + "population_type": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Population Type" }, - "member_count": { + "measured_property": { + "type": "string", + "title": "Measured Property" + }, + "stat_type": { "anyOf": [ { - "type": "integer" + "type": "string" }, { "type": "null" } ], - "title": "Member Count", - "description": "how many entities this axis' open scope resolves to, leaving out the group totals the code index declares beside their members (party_kind total), as the default download leaves them out; a scope of totals alone counts them all. None when the count could not be established without a read this response chose not to make (e.g. a discovered opposite axis whose own role index was omitted after a cap trip); the fact still publishes in that case, naming the axis as open with an explicit unknown rather than staying silent about it" + "title": "Stat Type" }, - "members_available": { - "type": "boolean", - "title": "Members Available", - "description": "whether the member list this count summarises is itself known and could be enumerated (e.g. through entity_options or the options door), not just counted. False exactly when member_count is None" + "measurement_qualifier": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Measurement Qualifier" }, - "holds_multilaterals": { + "measurement_denominator": { "anyOf": [ { - "type": "boolean" + "type": "string" }, { "type": "null" } ], - "title": "Holds Multilaterals", - "description": "for the origin axis, whether its open population holds a multilateral organisation (see ResolvedEntity.multilateral), read from the member list where it is known and otherwise from the parties the served datasets publish on the axis: true for the CRS's donors. Absent for the destination axis" + "title": "Measurement Denominator" + }, + "constraint_properties": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Constraint Properties", + "description": "the names of the constraint properties the StatVars set, sorted" + }, + "observation_properties": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Observation Properties", + "description": "the observation properties the StatVars declare, sorted" + }, + "stat_var_count": { + "type": "integer", + "title": "Stat Var Count", + "description": "how many of the Provenance's StatVars follow it" + }, + "examples": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Examples", + "description": "the first three of those StatVars' dcids in sorted order" } }, - "additionalProperties": false, "type": "object", "required": [ - "role", - "member_count", - "members_available" + "population_type", + "measured_property", + "stat_type", + "measurement_qualifier", + "measurement_denominator", + "constraint_properties", + "observation_properties", + "stat_var_count", + "examples" ], - "title": "RoleAxisFact", - "description": "One directional role axis (origin or destination) a role-bearing\nSpec's query left open, and what this Spec's own confirmation already\nknows about its member scope (see ResolvedSpec.role_axis_facts).\n\nUnlike OpenConstraintAxisFact, a role axis has no declared value of its\nown that could vary across served members -- the axis is a place a flow\nentity binds, not a constraint members assert -- so this carries no\nvaries/undeclared_count of its own; it carries only what a role axis\ngenuinely has: a population size and whether that population is known." + "title": "SchemaPattern", + "description": "One distinct way a Provenance's StatVars use the model." }, - "RootEntry": { + "SchemaTerm": { "properties": { "ref": { "type": "string", - "title": "Ref" + "title": "Ref", + "description": "the term's dcid" }, "label": { "anyOf": [ @@ -18869,125 +19901,100 @@ "type": "null" } ], - "title": "Label" + "title": "Label", + "description": "the term's name; null when the graph gives none" }, - "count": { - "type": "integer", - "title": "Count", - "description": "codes for a code system, members under the default projection for a group or region, Datasets for a source" + "types": { + "items": { + "type": "string", + "enum": [ + "Class", + "Property" + ] + }, + "type": "array", + "title": "Types", + "description": "whether the term is typed Class, Property or both" + }, + "provenances": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Provenances", + "description": "the Provenances declaring the term's typeOf arc, verbatim, empty when declared_by is null" + }, + "declared_by": { + "anyOf": [ + { + "$ref": "#/components/schemas/DeclaredBy" + }, + { + "type": "null" + } + ], + "description": "the origin declaring the term, by the node's rule; null when the graph names no declaring Provenance for the term: its listing entries carry none" } }, "type": "object", "required": [ "ref", "label", - "count" + "types", + "provenances", + "declared_by" ], - "title": "GraphRootEntry", - "description": "A place to start listing from, with the length of its list." + "title": "SchemaTerm", + "description": "One Class or Property on the graph." }, - "RootRendering": { + "SchemaTerms": { "properties": { - "without_party_totals": { - "type": "boolean", - "title": "Without Party Totals", - "description": "Deprecated: use party_totals. true leaves group totals out, as party_totals: false does" - }, - "party_totals": { - "type": "boolean", - "title": "Party Totals", - "description": "Whether group totals stay in the frame. This is the preferred name of the party-totals cut. Absent, totals stay, unless without_party_totals is true. false leaves out the rows whose party, on a flow party role the identity binds no entity on, the code index declares a group total. It equals without_party_totals: true. Both may be given when they agree. The cut is recorded and served as without_party_totals" - }, - "columns": { + "generation": { "anyOf": [ { - "items": { - "type": "string", - "maxLength": 200, - "minLength": 1 - }, - "type": "array", - "maxItems": 32 + "type": "string" }, { "type": "null" } ], - "title": "Columns" + "title": "Generation", + "description": "the graph generation the list was built from; null when unknown" }, - "groupby": { - "anyOf": [ - { - "$ref": "#/components/schemas/GroupbyOptions" - }, - { - "type": "null" - } - ] + "terms": { + "items": { + "$ref": "#/components/schemas/SchemaTerm" + }, + "type": "array", + "title": "Terms" } }, - "additionalProperties": false, "type": "object", - "title": "RootRendering", - "description": "How a dataset root's frame is read. `columns` left out takes the enrichment its\ndataset's roles need (`default_enrichment`); `[]` reads the stored frame\nalone. `groupby` reads the frame summed as a mint with that `options.groupby` sums it." + "required": [ + "generation", + "terms" + ], + "title": "SchemaTerms", + "description": "Every Class and Property the DFO graph lists by `typeOf`, base Data Commons terms\nincluded. The UN origin's terms are not listed, even where the deployment serves it." }, - "Roots": { + "SchemaValueCount": { "properties": { - "code_systems": { - "items": { - "$ref": "#/components/schemas/RootEntry" - }, - "type": "array", - "title": "Code Systems" - }, - "groups": { - "items": { - "$ref": "#/components/schemas/RootEntry" - }, - "type": "array", - "title": "Groups" - }, - "regions": { - "items": { - "$ref": "#/components/schemas/RootEntry" - }, - "type": "array", - "title": "Regions" - }, - "sources": { - "items": { - "$ref": "#/components/schemas/RootEntry" - }, - "type": "array", - "title": "Sources" + "value": { + "type": "string", + "title": "Value" }, - "built_from": { - "additionalProperties": { - "type": "string" - }, - "propertyNames": { - "enum": [ - "code_index", - "origin_catalogue", - "coverage_index", - "membership" - ] - }, - "type": "object", - "title": "Built From", - "description": "the build of each table the document read" + "stat_var_count": { + "type": "integer", + "title": "Stat Var Count" } }, "type": "object", "required": [ - "code_systems", - "groups", - "regions", - "sources", - "built_from" + "value", + "stat_var_count" ], - "title": "GraphRoots", - "description": "`GET /api/graph/roots`: where to start listing. Each list is ordered by dcid." + "title": "SchemaValueCount", + "description": "One value a constraint property takes, and how many StatVars take it." }, "Scope-Input": { "properties": { @@ -23575,7 +24582,7 @@ }, "type": "array", "title": "Departures", - "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" + "description": "every way this part's answer differs from what its request asked, ordered by how much each changes the number: closest_match, measure_not_applied, operation_not_applied, breakdown_not_applied, entity_unavailable, member_unavailable, year_unavailable, modelled_values, group_read_as_members, whole_total_read, whole_total_unpublished, direction_discarded, organisation_read_as_source, direction_inferred, organisation_read_as_party, core_contribution_read, scope_limited. [] when the answer is what was asked. A client that renders its own sentence reads them here; each one's text also closes the sentence that carries this part (see Departure.text). A warning on the same part reports run health and stays separate" }, "assumptions": { "items": { @@ -23955,7 +24962,7 @@ } ], "title": "Params", - "description": "the counts and labels the message states, for a client to compose its own text. observations_series_truncated: {shown, total, order}, the series shown, the confirmed series behind them, and how the shown series were chosen: 'ranked' (the most recent and largest) or 'fixed' (a selection made before values were read, not ranked by value). elected_shape_no_data: {no_data, elected}, the labels of the readings with no data and of the readings answered instead. un_system_unavailable: {places, variables, variable_labels}, the place dcids the UN front door refused, the variables of the UN reads that failed, each empty when none, and each variable's graph name, in variables order, '' where the graph holds none; a warning without params says the UN search itself was unavailable. whole_total_available: {total, total_label, whole_of}, the dcid and label of the total the source publishes for the side the answer lists member by member, and the classes of party it covers, comma-joined (official, private, residual). currency_unmapped_omitted: {count, entities, entity_labels}, how many entities the conversion left out, the dcids of the first ten, sorted, and each one's name, in entities order, '' where the conversion tables hold none, which is usual here, since an entity no currency names, such as a regional aggregate, is rarely in those tables; its dcid stays in entities. deflator_missing_omitted: the same with entity_years, the years each entity's rows were left out, as runs of consecutive years ('1990-2001, 2004'), in entities order; a warning without params says the loaded tables cannot tell which entities. deflator_projected: {count, examples}, how many rows took a projected rate or deflator, and at most ten distinct entity@year keys among them, sorted; count counts rows, not keys, and examples may leave keys out. Omitted for every other code" + "description": "the counts and labels the message states, for a client to compose its own text. observations_series_truncated: {shown, total, order}, the series shown, the confirmed series behind them, and how the shown series were chosen: 'ranked' (the most recent and largest) or 'fixed' (a selection made before values were read, not ranked by value). elected_shape_no_data: {no_data, elected}, the labels of the readings with no data and of the readings answered instead. un_system_unavailable: {places, variables, variable_labels}, the place dcids the UN front door refused, the variables of the UN reads that failed, each empty when none, and each variable's graph name, in variables order, '' where the graph holds none; a warning without params says the UN search itself was unavailable. whole_total_available: {total, total_label, whole_of}, the dcid and label of the total the source publishes for the side the answer lists member by member, and the classes of party it covers, comma-joined (official, private, residual). bilateral_reading_unavailable: {why, slot}, why a DAC2a total ODA answer could not read its bilateral destinations alone, one of the reasons dfo-spec-kit's registries/warning-reasons.json lists for the code (destination_unclassified, option_not_covered, read_window_not_covered, scope_undecided, slot_not_served), and for slot_not_served alone the property of the slot the bilateral composite cannot serve. currency_unmapped_omitted: {count, entities, entity_labels}, how many entities the conversion left out, the dcids of the first ten, sorted, and each one's name, in entities order, '' where the conversion tables hold none, which is usual here, since an entity no currency names, such as a regional aggregate, is rarely in those tables; its dcid stays in entities. deflator_missing_omitted: the same with entity_years, the years each entity's rows were left out, as runs of consecutive years ('1990-2001, 2004'), in entities order; a warning without params says the loaded tables cannot tell which entities. deflator_projected: {count, examples}, how many rows took a projected rate or deflator, and at most ten distinct entity@year keys among them, sorted; count counts rows, not keys, and examples may leave keys out. role_scope_defaulted: {axis}, the open role axis the answer covers in full, origin or destination. Omitted for every other code" } }, "additionalProperties": false, @@ -23966,7 +24973,7 @@ "message" ], "title": "Warning", - "description": "A run-health signal. Note: this name shadows the Python builtin Warning.\n\nOnly `observations_series_truncated`, `elected_shape_no_data`, `un_system_unavailable`,\n`whole_total_available`, `currency_unmapped_omitted`, `deflator_missing_omitted` and\n`deflator_projected` set `params`. A `None` `params` is left out of every dump, so other codes' warnings stay\nexactly `{code, severity, message}` plus `spec_id` where one applies." + "description": "A run-health signal. Note: this name shadows the Python builtin Warning.\n\nOnly `observations_series_truncated`, `elected_shape_no_data`, `un_system_unavailable`,\n`whole_total_available`, `bilateral_reading_unavailable`, `currency_unmapped_omitted`,\n`deflator_missing_omitted`, `deflator_projected` and `role_scope_defaulted` set `params`. A `None` `params` is left out of every dump, so other codes' warnings stay\nexactly `{code, severity, message}` plus `spec_id` where one applies." }, "WarningModel": { "properties": { @@ -24443,6 +25450,16 @@ ], "title": "_ExportSlot" }, + "_OptionalText": { + "anyOf": [ + { + "$ref": "#/components/schemas/_Text" + }, + { + "type": "null" + } + ] + }, "_Ref": { "properties": { "format_version": { @@ -24548,6 +25565,10 @@ ], "title": "_RefSpec" }, + "_Text": { + "type": "string", + "maxLength": 512 + }, "datasets_api__capabilities__Capabilities": { "properties": { "capability_version": { @@ -24948,6 +25969,21 @@ "type": "integer", "title": "Max Node Batch Dcids", "description": "the most dcids one POST /api/graph/nodes request names; a longer list is refused 400 request_invalid" + }, + "max_check_rows": { + "type": "integer", + "title": "Max Check Rows", + "description": "the most rows one POST /api/graph/schema/check request carries; a request with more is refused 400 request_invalid. A request within it may be answered for its first rows only, rows_checked counting them" + }, + "max_check_constraint_properties": { + "type": "integer", + "title": "Max Check Constraint Properties", + "description": "the most entries in one POST /api/graph/schema/check row's constraint_properties; a row with more is refused 400 request_invalid" + }, + "max_check_observation_properties": { + "type": "integer", + "title": "Max Check Observation Properties", + "description": "the most entries in one POST /api/graph/schema/check row's observation_properties; a row with more is refused 400 request_invalid" } }, "type": "object", @@ -24956,7 +25992,10 @@ "resolve_timeout_seconds", "node_timeout_seconds", "max_dcid_chars", - "max_node_batch_dcids" + "max_node_batch_dcids", + "max_check_rows", + "max_check_constraint_properties", + "max_check_observation_properties" ], "title": "GraphCapabilityCaps", "description": "Published input limits, one field per enforced constant." @@ -24966,7 +26005,7 @@ "name": { "type": "string", "title": "Name", - "description": "resolve, node, members, roots, sources, or schema" + "description": "resolve, node, members, roots, sources, json_schema, or schema" }, "live": { "type": "boolean", diff --git a/tools/tests/test_capture_client_contract.py b/tools/tests/test_capture_client_contract.py index c147473..407361a 100644 --- a/tools/tests/test_capture_client_contract.py +++ b/tools/tests/test_capture_client_contract.py @@ -745,8 +745,8 @@ def test_a_long_build_scan_starts_after_the_recorded_year( def test_the_long_build_scans_start_after_the_recorded_picks() -> None: - """The records hold the DAC pick at 1971 and the OECD pick at 1972.""" - assert capture.long_build_starts(SCENARIOS) == {"DAC": 1972, "OECD": 1973} + """The records hold the DAC pick at 1973 and the OECD pick at 1974.""" + assert capture.long_build_starts(SCENARIOS) == {"DAC": 1974, "OECD": 1975} def test_a_long_build_scan_skips_a_year_without_an_estimate(