Skip to content

Fix ArrayXD YAML conversion #6168

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
merged 4 commits into from
Dec 12, 2023
Merged

Fix ArrayXD YAML conversion #6168

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a528934
Fix ArrayXD YAML conversion
mariosasko Aug 22, 2023
152a9de
Convert tuples to list
mariosasko Dec 11, 2023
68ea674
Merge branch 'main' of github.com:huggingface/datasets into fix-6112
mariosasko Dec 11, 2023
853ba06
Nit
mariosasko Dec 11, 2023
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: 14 additions & 2 deletions src/datasets/features/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1776,10 +1776,22 @@ def to_yaml_inner(obj: Union[dict, list]) -> dict:
return {"struct": [{"name": name, **to_yaml_inner(_feature)} for name, _feature in obj.items()]}
elif isinstance(obj, list):
return simplify({"list": simplify(to_yaml_inner(obj[0]))})
elif isinstance(obj, tuple):
return to_yaml_inner(list(obj))
else:
raise TypeError(f"Expected a dict or a list but got {type(obj)}: {obj}")

return to_yaml_inner(yaml_data)["struct"]
def to_yaml_types(obj: dict) -> dict:
if isinstance(obj, dict):
return {k: to_yaml_types(v) for k, v in obj.items()}
elif isinstance(obj, list):
return [to_yaml_types(v) for v in obj]
elif isinstance(obj, tuple):
return to_yaml_types(list(obj))
else:
return obj

return to_yaml_types(to_yaml_inner(yaml_data)["struct"])
Comment on lines +1784 to +1794
Copy link
Member

@lhoestq lhoestq Dec 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this needed ?

Suggested change
def to_yaml_types(obj: dict) -> dict:
if isinstance(obj, dict):
return {k: to_yaml_types(v) for k, v in obj.items()}
elif isinstance(obj, list):
return [to_yaml_types(v) for v in obj]
elif isinstance(obj, tuple):
return to_yaml_types(list(obj))
else:
return obj
return to_yaml_types(to_yaml_inner(yaml_data)["struct"])
return to_yaml_inner(yaml_data)["struct"]

Copy link
Collaborator Author

@mariosasko mariosasko Dec 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, to_yaml_inner doesn't traverse the leaves (attributes) of the complex types (Image, ArrayXD, etc.)


@classmethod
def _from_yaml_list(cls, yaml_data: list) -> "Features":
Expand Down Expand Up @@ -1837,7 +1849,7 @@ def from_yaml_inner(obj: Union[dict, list]) -> Union[dict, list]:
Value(obj["dtype"])
return {**obj, "_type": "Value"}
except ValueError:
# for audio and image that are Audio and Image types, not Value
# e.g. Audio, Image, ArrayXD
return {"_type": snakecase_to_camelcase(obj["dtype"])}
else:
return from_yaml_inner(obj["dtype"])
Expand Down