Skip to content

Pydantic: update divisions to match data & fix constraints #450

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
Victor Schappert (vcschapp) merged 6 commits into from
Mar 4, 2026
Merged

Pydantic: update divisions to match data & fix constraints #450

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f1a463
Widen AdminLevel from uint8 to int32
Rachmanin0xFF Feb 25, 2026
05a421d
Fix Pydantic rebinding self in model constraint validator
Rachmanin0xFF Feb 25, 2026
09bfa86
update json
Rachmanin0xFF Feb 25, 2026
9066407
constrain admin_level
Rachmanin0xFF Feb 27, 2026
4566a1d
oops, forgot to regen
Rachmanin0xFF Feb 27, 2026
6521748
Merge branch 'dev' into fix/divisions-and-constraint-updates
Rachmanin0xFF Mar 4, 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
4 changes: 2 additions & 2 deletions packages/overture-schema-divisions-theme/src/overture/schema/divisions/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
from pydantic import Field

from overture.schema.system.field_constraint import UniqueItemsConstraint
from overture.schema.system.primitive import uint8
from overture.schema.system.primitive import int32

from .models import HierarchyItem

AdminLevel = NewType(
"AdminLevel",
Annotated[
uint8,
int32,
Field(
description="Integer representing the division's position in its country's administrative hierarchy, where lower numbers correspond to higher level administrative units.",
),
Expand Down
4 changes: 2 additions & 2 deletions packages/overture-schema-divisions-theme/tests/division_area_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@
"properties": {
"admin_level": {
"description": "Integer representing the division's position in its country's administrative hierarchy, where lower numbers correspond to higher level administrative units.",
"maximum": 255,
"minimum": 0,
"maximum": 2147483647,
"minimum": -2147483648,
Comment thread
Rachmanin0xFF marked this conversation as resolved.
Outdated
"title": "Admin Level",
"type": "integer"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/overture-schema-divisions-theme/tests/division_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@
"properties": {
"admin_level": {
"description": "Integer representing the division's position in its country's administrative hierarchy, where lower numbers correspond to higher level administrative units.",
"maximum": 255,
"minimum": 0,
Comment thread
Rachmanin0xFF marked this conversation as resolved.
"maximum": 2147483647,
"minimum": -2147483648,
"title": "Admin Level",
"type": "integer"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/overture-schema-divisions-theme/tests/division_boundary_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@
"properties": {
"admin_level": {
"description": "Integer representing the division's position in its country's administrative hierarchy, where lower numbers correspond to higher level administrative units.",
"maximum": 255,
"minimum": 0,
"maximum": 2147483647,
"minimum": -2147483648,
"title": "Admin Level",
"type": "integer"
},
Expand Down
15 changes: 10 additions & 5 deletions ...es/overture-schema-system/src/overture/schema/system/model_constraint/model_constraint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ def __init__(self, name: str | None = None):
)
self.__name = name

def __validate_instance(self, model_instance: BaseModel) -> BaseModel:
self.validate_instance(model_instance)
return model_instance

@property
def name(self) -> str:
"""Returns the name of the constraint, e.g. "FooConstraint" or "@foo"."""
Expand Down Expand Up @@ -126,6 +122,15 @@ def decorate(self, model_class: type[BaseModel]) -> type[BaseModel]:
metadata = Metadata.retrieve_from(model_class, Metadata()).copy() # type: ignore[union-attr]
model_constraints = (*ModelConstraint.get_model_constraints(model_class), self)
metadata[_MODEL_CONSTRAINT_KEY] = model_constraints
# Capture the constraint in a closure rather than passing a bound method.
# Some Pydantic versions unwrap bound methods passed through __validators__
# and rebind `self` to the model instance, breaking the dispatch.
constraint = self

def _after_validator(model_instance: BaseModel) -> BaseModel:
constraint.validate_instance(model_instance)
return model_instance

new_model_class = create_model(
model_class.__name__,
__config__=config,
Expand All @@ -135,7 +140,7 @@ def decorate(self, model_class: type[BaseModel]) -> type[BaseModel]:
__validators__={
self.name: cast(
Callable[..., Any],
model_validator(mode="after")(self.__validate_instance),
model_validator(mode="after")(_after_validator),
)
},
__metadata__=metadata,
Expand Down