Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions src/microplex_us/targets/arch.py
Original file line number Diff line number Diff line change
Expand Up @@ -4545,6 +4545,9 @@ def _arch_consumer_fact_constraint(
variable = str(constraint["variable"])
if variable in ARCH_IGNORED_FACT_CONSTRAINT_VARIABLES:
return None
value = _json_scalar_text(constraint.get("value"))
if variable == "sex":
return _arch_sex_constraint(str(constraint["operator"]), value)
try:
mapped_variable = ARCH_FACT_CONSTRAINT_VARIABLE_ALIASES[variable]
except KeyError as exc:
Expand All @@ -4554,7 +4557,7 @@ def _arch_consumer_fact_constraint(
return (
mapped_variable,
str(constraint["operator"]),
_json_scalar_text(constraint.get("value")),
value,
)


Expand Down Expand Up @@ -4689,6 +4692,13 @@ def _arch_fact_constraint(row: sqlite3.Row) -> tuple[str, str, str] | None:
variable = str(row["constraint_variable"])
if variable in ARCH_IGNORED_FACT_CONSTRAINT_VARIABLES:
return None
value = _sqlite_json_scalar_text(
row["constraint_value_text"],
row["constraint_value_numeric"],
row["constraint_value_json"],
)
if variable == "sex":
return _arch_sex_constraint(str(row["constraint_operator"]), value)
try:
mapped_variable = ARCH_FACT_CONSTRAINT_VARIABLE_ALIASES[variable]
except KeyError as exc:
Expand All @@ -4698,11 +4708,25 @@ def _arch_fact_constraint(row: sqlite3.Row) -> tuple[str, str, str] | None:
return (
mapped_variable,
str(row["constraint_operator"]),
_sqlite_json_scalar_text(
row["constraint_value_text"],
row["constraint_value_numeric"],
row["constraint_value_json"],
),
value,
)


def _arch_sex_constraint(operator: str, value: str) -> tuple[str, str, str]:
canonical_operator = _canonical_arch_constraint_operator(operator)
value_text = str(value).strip().lower()
if value_text in {"female", "f", "2", "2.0"}:
is_female_value = "1"
elif value_text in {"male", "m", "1", "1.0"}:
is_female_value = "0"
else:
raise ValueError(f"No Microplex Arch sex constraint mapping for value {value!r}")
if canonical_operator == "==":
return ("is_female", "==", is_female_value)
if canonical_operator == "!=":
return ("is_female", "==", "0" if is_female_value == "1" else "1")
raise ValueError(
f"No Microplex Arch sex constraint mapping for operator {operator!r}"
)


Expand Down
55 changes: 55 additions & 0 deletions tests/targets/test_arch_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -1562,6 +1562,61 @@ def test_arch_consumer_fact_jsonl_provider_maps_acs_district_age_rows(
}


def test_arch_consumer_fact_jsonl_provider_maps_acs_state_age_sex_rows(
tmp_path: Path,
) -> None:
consumer_jsonl = tmp_path / "consumer_facts.jsonl"
row = _consumer_fact(
"acs-ca-female-40-44",
concept="census_acs.person_count",
domain="total_population",
source_name="census_acs",
source_table="ACS B01001 state female age",
period={"type": "calendar_year", "value": 2023},
geography={"level": "state", "id": "0400000US06", "name": "California"},
value=1_300_307,
constraints=(
{
"variable": "age",
"operator": ">=",
"value": 40,
"unit": "years",
"role": "filter",
},
{
"variable": "age",
"operator": "<",
"value": 45,
"unit": "years",
"role": "filter",
},
{
"variable": "sex",
"operator": "==",
"value": "female",
"role": "filter",
},
),
)
consumer_jsonl.write_text(json.dumps(row, sort_keys=True) + "\n")

target_set = ArchConsumerFactJSONLTargetProvider(consumer_jsonl).load_target_set(
TargetQuery(period=2023)
)

assert len(target_set.targets) == 1
target = target_set.targets[0]
assert target.value == 1_300_307
assert target.metadata["variable"] == "person_count"
assert target.metadata["geo_level"] == "state"
assert _target_filter_tuples(target) == {
("age", ">=", "40"),
("age", "<", "45"),
("is_female", "==", "1"),
("state_fips", "==", "06"),
}


def test_arch_consumer_fact_jsonl_provider_maps_acs_district_snap_rows(
tmp_path: Path,
) -> None:
Expand Down
Loading