Neat 242 allow arbitrary filters but raise warning that we do not support them #451
Conversation
This file contains 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
…arning-that-we-do-not-support-them
☂️ Python Coverage
Overall Coverage
New FilesNo new covered files... Modified Files
|
doctrino
approved these changes
May 14, 2024
| @@ -15,6 +17,7 @@ class WrappedEntity(BaseModel, ABC): | |||
| name: ClassVar[str] | |||
| _inner_cls: ClassVar[type[Entity]] | |||
| inner: list[Entity] | None | |||
| filter: str | None = None | |||
There was a problem hiding this comment.
This seems to be only used by the RawFilter, so is there any reason to have it on the base class?
Suggested change
| filter: str | None = None |
Comment on lines
94
to
97
| if self.filter: | ||
| return self.filter | ||
| else: | ||
| return self.id |
There was a problem hiding this comment.
Suggest just overriding the __repr__ in the RawFilter class
| @@ -150,6 +192,7 @@ class HasDataFilter(DMSFilter): | |||
| name: ClassVar[str] = "hasData" | |||
| _inner_cls: ClassVar[type[ContainerEntity]] = ContainerEntity | |||
| inner: list[ContainerEntity] | None = None # type: ignore[assignment] | |||
| filter: str | None = None | |||
There was a problem hiding this comment.
Suggested change
| filter: str | None = None |
| @@ -112,10 +129,35 @@ def from_dms_filter(cls, filter: dm.Filter) -> "DMSFilter": | |||
| if isinstance(entry, dict) and "space" in entry and "externalId" in entry | |||
| ] | |||
| ) | |||
| else: | |||
| return RawFilter(filter=json.dumps(dumped)) | |||
|
|
|||
| raise ValueError(f"Cannot convert {filter._filter_name} to {cls.__name__}") | |||
There was a problem hiding this comment.
This can now be removed as it cannot be reached. (The exception)
|
|
||
| raise ValueError(f"Cannot convert {filter._filter_name} to {cls.__name__}") | ||
|
|
||
|
|
||
| class RawFilter(DMSFilter): | ||
| name: ClassVar[str] = "rawFilter" | ||
| inner: list[ContainerEntity] | None = None # type: ignore[assignment] |
There was a problem hiding this comment.
Overwriting the base class forcing this to None
Suggested change
| inner: list[ContainerEntity] | None = None # type: ignore[assignment] | |
| inner: None = None # type: ignore[assignment] |
nikokaoja
deleted the
NEAT-242-Allow-arbitrary-filters-but-raise-warning-that-we-do-not-support-them
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
[0.77.1] - 14-05-24
Added
RawFiltersallow arbitrary filters to be applied to the data model.