Skip to content

feat(core): add contextual information when propertyDomain fails validation #1291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlessandroPomponio merged 3 commits into from
Jul 31, 2026
Merged

feat(core): add contextual information when propertyDomain fails validation #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb384f8
feat(core): annotate domain validation errors with property identifier
AlessandroPomponio Jul 27, 2026
ecb3d5b
Revert "feat(core): annotate domain validation errors with property i…
AlessandroPomponio Jul 31, 2026
93a9138
feat(core): add contextual information when propertyDomain fails vali…
AlessandroPomponio Jul 31, 2026
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
18 changes: 13 additions & 5 deletions ado/schema/domain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,8 +659,12 @@ def variableType_matches_values(
valuesCheck = values.data.get("values") is not None
intervalCheck = values.data.get("interval") is not None
if not (valuesCheck or intervalCheck):
domain_range = values.data.get("domainRange")
raise ValueError(
"A DISCRETE_VARIABLE_TYPE had neither values nor interval specified"
f"A DISCRETE_VARIABLE_TYPE had neither values nor interval specified. "
f"Provided: values={values.data.get('values')}, "
f"interval={values.data.get('interval')}, "
f"domainRange={domain_range}"
)

elif value == VariableTypeEnum.CONTINUOUS_VARIABLE_TYPE:
Expand All @@ -677,12 +681,14 @@ def variableType_matches_values(
elif value == VariableTypeEnum.OPEN_CATEGORICAL_VARIABLE_TYPE:
if values.data.get("interval") is not None:
raise ValueError(
"The interval field of an OPEN_CATEGORICAL_VARIABLE_TYPE was not None"
f"An OPEN_CATEGORICAL_VARIABLE_TYPE must not have interval specified. "
f"Provided: interval={values.data.get('interval')}"
)

if values.data.get("domainRange") is not None:
raise ValueError(
"The domainRange field of an OPEN_CATEGORICAL_VARIABLE_TYPE was not None"
f"An OPEN_CATEGORICAL_VARIABLE_TYPE must not have domainRange specified. "
f"Provided: domainRange={values.data.get('domainRange')}"
)

elif value == VariableTypeEnum.BINARY_VARIABLE_TYPE:
Expand All @@ -700,12 +706,14 @@ def variableType_matches_values(

if values.data.get("interval") is not None:
raise ValueError(
"The interval field for a BINARY_VARIABLE_TYPE must be None"
f"A BINARY_VARIABLE_TYPE must not have interval specified. "
f"Provided: interval={values.data.get('interval')}"
)

if values.data.get("domainRange") is not None:
raise ValueError(
"The domainRange field for a BINARY_VARIABLE_TYPE must be None"
f"A BINARY_VARIABLE_TYPE must not have domainRange specified. "
f"Provided: domainRange={values.data.get('domainRange')}"
)

return value
Expand Down
4 changes: 2 additions & 2 deletions tests/schema/test_domain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,15 +1066,15 @@ def test_binary_variable_type_with_no_values() -> None:
def test_binary_variable_type_rejects_interval() -> None:
"""Test that BINARY_VARIABLE_TYPE rejects interval specification"""
with pytest.raises(
ValueError, match="interval field for a BINARY_VARIABLE_TYPE must be None"
ValueError, match="A BINARY_VARIABLE_TYPE must not have interval specified"
):
PropertyDomain(variableType=VariableTypeEnum.BINARY_VARIABLE_TYPE, interval=1)


def test_binary_variable_type_rejects_domain_range() -> None:
"""Test that BINARY_VARIABLE_TYPE rejects domainRange specification"""
with pytest.raises(
ValueError, match="domainRange field for a BINARY_VARIABLE_TYPE must be None"
ValueError, match="A BINARY_VARIABLE_TYPE must not have domainRange specified"
):
PropertyDomain(
variableType=VariableTypeEnum.BINARY_VARIABLE_TYPE, domainRange=[0, 1]
Expand Down