Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions src/hyrax/config_schemas/data_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,9 @@ def as_dict(self, *, exclude_unset: bool = False) -> dict[str, Any]:
if value is not None:
# Handle both single config and dict of configs
if isinstance(value, dict):
# Dict of configs - wrap each in {"data": ...}
# Dict of configs - keys are already friendly names
output[name] = {
key: {"data": cfg.as_dict(exclude_unset=exclude_unset)}
for key, cfg in value.items()
key: cfg.as_dict(exclude_unset=exclude_unset) for key, cfg in value.items()
}
else:
# Single config - wrap in {"data": ...}
Expand Down
6 changes: 3 additions & 3 deletions tests/hyrax/test_data_request_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,6 @@ def test_as_dict_with_dict_configs():
assert "train" in as_dict
assert "data_0" in as_dict["train"]
assert "data_1" in as_dict["train"]
assert as_dict["train"]["data_0"]["data"]["dataset_class"] == "HyraxRandomDataset"
assert as_dict["train"]["data_0"]["data"]["primary_id_field"] == "id"
assert as_dict["train"]["data_1"]["data"]["dataset_class"] == "HyraxCifarDataset"
assert as_dict["train"]["data_0"]["dataset_class"] == "HyraxRandomDataset"
assert as_dict["train"]["data_0"]["primary_id_field"] == "id"
assert as_dict["train"]["data_1"]["dataset_class"] == "HyraxCifarDataset"