Skip to content

fix: Update model_validator to use instance method signature (Pydantic v2.12 deprecation) #5825

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
ntkathole merged 2 commits into from
Jan 13, 2026
Merged

fix: Update model_validator to use instance method signature (Pydantic v2.12 deprecation) #5825

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a42fe11
fix: update model_validator to use instance method signature
WhiteLotusLA Jan 9, 2026
ef12707
Merge branch 'master' into fix/pydantic-model-validator-deprecation
WhiteLotusLA Jan 12, 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
16 changes: 7 additions & 9 deletions sdk/python/feast/permissions/auth_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,23 @@ class OidcClientAuthConfig(OidcAuthConfig):
token: Optional[str] = None # pre-issued `token`

@model_validator(mode="after")
def _validate_credentials(cls, values):
def _validate_credentials(self):
"""Enforce exactly one valid credential set."""
d = values.__dict__ if hasattr(values, "__dict__") else values

has_user_pass = bool(d.get("username")) and bool(d.get("password"))
has_secret = bool(d.get("client_secret"))
has_token = bool(d.get("token"))
has_user_pass = bool(self.username) and bool(self.password)
has_secret = bool(self.client_secret)
has_token = bool(self.token)

# 1 static token
if has_token and not (has_user_pass or has_secret):
return values
return self

# 2 client_credentials
if has_secret and not has_user_pass and not has_token:
return values
return self

# 3 ROPG
if has_user_pass and has_secret and not has_token:
return values
return self

raise ValueError(
"Invalid OIDC client auth combination: "
Expand Down
Loading