-
Notifications
You must be signed in to change notification settings - Fork 380
Make Not expression JSON serializable #2593
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.
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
+19
−4
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
28c2165
Make Not expression JSON serializable
Aniketsy bb091bd
Make Not expression JSON serializable
Aniketsy 7142a55
Merge branch 'main' into fix/not-json-serializable
Aniketsy ea62552
Update tests/expressions/test_expressions.py
Aniketsy 22147b9
Make Not expression JSON serializable
Aniketsy 6416b0c
Remove unused import
Fokko 313a2e6
Remove duplicate import
Fokko b89b54f
Add type annotations
Fokko b37f147
Add `__str__`
Fokko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,8 @@ | |
|
|
||
| from pydantic import Field | ||
|
|
||
| from pydantic import Field, model_validator | ||
Fokko marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| from pyiceberg.expressions.literals import ( | ||
| AboveMax, | ||
| BelowMin, | ||
|
|
@@ -341,21 +343,27 @@ def __getnewargs__(self) -> Tuple[BooleanExpression, BooleanExpression]: | |
| return (self.left, self.right) | ||
|
|
||
|
|
||
| class Not(BooleanExpression): | ||
| class Not(IcebergBaseModel, BooleanExpression): | ||
| """NOT operation expression - logical negation.""" | ||
|
|
||
| child: BooleanExpression | ||
|
|
||
| def __new__(cls, child: BooleanExpression) -> BooleanExpression: # type: ignore | ||
| @model_validator(mode="before") | ||
| def _before(cls, values: Any) -> Any: | ||
| if isinstance(values, BooleanExpression): | ||
| return {"child": values} | ||
| return values | ||
|
|
||
| @model_validator(mode="after") | ||
| def _normalize(cls, model: Any) -> Any: | ||
| child = model.child | ||
| if child is AlwaysTrue(): | ||
| return AlwaysFalse() | ||
| elif child is AlwaysFalse(): | ||
| return AlwaysTrue() | ||
| elif isinstance(child, Not): | ||
| return child.child | ||
| obj = super().__new__(cls) | ||
| obj.child = child | ||
| return obj | ||
| return model | ||
|
||
|
|
||
| def __repr__(self) -> str: | ||
Fokko marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| """Return the string representation of the Not class.""" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.