Skip to content
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

Fixup Optional runopt cfg values handling during cfg_from_json_repr deserialization #1000

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Fixup Optional runopt cfg values handling during cfg_from_json_repr deserialization #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion torchx/specs/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,12 @@ def cfg_from_json_repr(self, json_repr: str) -> Dict[str, CfgVal]:
for key, val in cfg_dict.items():
runopt_ = self.get(key)
if runopt_:
if runopt_.opt_type == List[str]:
# Optional runopt cfg values default their value to None,
# but use `_type` to specify their type when provided.
# Make sure not to treat None's as lists/dictionaries
if val is None:
cfg[key] = val
elif runopt_.opt_type == List[str]:
cfg[key] = [str(v) for v in val]
elif runopt_.opt_type == Dict[str, str]:
cfg[key] = {str(k): str(v) for k, v in val.items()}
Expand Down
5 changes: 4 additions & 1 deletion torchx/specs/test/api_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ def test_config_from_json_repr(self) -> None:
opts.add("disable", type_=bool, default=True, help="")
opts.add("complex_list", type_=List[str], default=[], help="")
opts.add("complex_dict", type_=Dict[str, str], default={}, help="")
opts.add("default_none", type_=List[str], help="")

self.assertDictEqual(
{
Expand All @@ -565,6 +566,7 @@ def test_config_from_json_repr(self) -> None:
"disable": False,
"complex_list": ["v1", "v2", "v3"],
"complex_dict": {"k1": "v1", "k2": "v2"},
"default_none": None,
},
opts.resolve(
opts.cfg_from_json_repr(
Expand All @@ -575,7 +577,8 @@ def test_config_from_json_repr(self) -> None:
"enable": true,
"disable": false,
"complex_list": ["v1", "v2", "v3"],
"complex_dict": {"k1": "v1", "k2": "v2"}
"complex_dict": {"k1": "v1", "k2": "v2"},
"default_none": null
}"""
)
),
Expand Down
Loading