Enable defining nested data types #193
Merged
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
PhilippeMoussalli
added
Core
PhilippeMoussalli
requested review from
RobbeSneyders,
GeorgesLorre and
NielsRogge
5 tasks
NielsRogge
reviewed
Jun 8, 2023
NielsRogge
reviewed
Jun 8, 2023
PhilippeMoussalli
force-pushed
the
enable-nested-data
branch
4 times, most recently
from
6261e97
to
5be2a42
Compare
PhilippeMoussalli
force-pushed
the
enable-nested-data
branch
from
5be2a42
to
08bbc95
Compare
fondant/schema.py
Outdated
| """ | ||
| Types based on: | ||
| - https://arrow.apache.org/docs/python/api/datatypes.html#api-types | ||
| - https://pola-rs.github.io/polars/py-polars/html/reference/datatypes.html |
There was a problem hiding this comment.
This is now just based on arrow, right?
fondant/schema.py
Outdated
| Returns: | ||
| The validated `pa.DataType` object. | ||
| """ | ||
| if isinstance(data_type, str): |
There was a problem hiding this comment.
Suggested change
| if isinstance(data_type, str): | |
| if not isinstance(data_type, Type): |
I think this is a bit more robust. What if I pass in something that is not a Type nor a string? :)
There was a problem hiding this comment.
good catch
fondant/schema.py
Outdated
| if json_schema["type"] == "array": | ||
| items = json_schema["items"] | ||
| if isinstance(items, dict): | ||
| return cls.list(Type.from_json(items)) |
There was a problem hiding this comment.
Suggested change
| return cls.list(Type.from_json(items)) | |
| return cls.list(cls.from_json(items)) |
fondant/schema.py
Outdated
| if isinstance(items, dict): | ||
| return cls.list(Type.from_json(items)) | ||
| else: | ||
| return Type(json_schema["type"]) |
There was a problem hiding this comment.
Suggested change
| return Type(json_schema["type"]) | |
| return cls(json_schema["type"]) |
| @@ -60,16 +60,16 @@ def test_subset_fields(): | |||
| subset = Subset(specification=subset_spec, base_path="/tmp") | |||
|
|
|||
| # add a field | |||
| subset.add_field(name="data2", type_=Type.binary) | |||
| subset.add_field(name="data2", type_=Type("binary")) | |||
There was a problem hiding this comment.
It's a bit unfortunate that we lose the ability to reference types by attribute (and therefore autocomplete, static analysis, etc., ...). Unfortunately I don't see a straightforward way to keep them either.
There was a problem hiding this comment.
yeah indeed, you would need to know/type all possible combinations which is not very feasible. But it's not user-facing so it should not have that big of an impact.
RobbeSneyders
approved these changes
Jun 9, 2023
Hakimovich99
pushed a commit
that referenced
this pull request
Oct 16, 2023
PR that addresses #178 Inspiration: https://swagger.io/docs/specification/data-models/data-types/#:~:text=the%20null%20value.-,Arrays,-Arrays%20are%20defined (credit to @GeorgesLorre) It includes: * Changing the common json schema to enable defining array types * Changing the `Type` class to be dynamic rather than typed to enable defining nested structures without explicitly defining them * Adding an addition test file for `schema.py` * Updating the current existing examples (embedding + segmentation)
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.
PR that addresses #178
Inspiration: https://swagger.io/docs/specification/data-models/data-types/#:~:text=the%20null%20value.-,Arrays,-Arrays%20are%20defined (credit to @GeorgesLorre)
It includes:
Typeclass to be dynamic rather than typed to enable defining nested structures without explicitly defining themschema.py