8000 Make _replace_none properly handle "None" in parameter lists by matt-gardner · Pull Request #2774 · allenai/allennlp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Make _replace_none properly handle "None" in parameter lists #2774

Merged
merged 1 commit into from
Apr 29, 2019
Merged

Make _replace_none properly handle "None" in parameter lists #2774

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
17 changes: 10 additions & 7 deletions allennlp/common/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,10 +534,13 @@ def pop_choice(params: Dict[str, Any],
return value


def _replace_none(dictionary: Dict[str, Any]) -> Dict[str, Any]:
for key in dictionary.keys():
if dictionary[key] == "None":
dictionary[key] = None
elif isinstance(dictionary[key], dict):
dictionary[key] = _replace_none(dictionary[key])
return dictionary
def _replace_none(params: Any) -> Any:
if params == "None":
return None
elif isinstance(params, dict):
for key, value in params.items():
params[key] = _replace_none(value)
return params
elif isinstance(params, list):
return [_replace_none(value) for value in params]
return params
9 changes: 6 additions & 3 deletions allennlp/tests/common/params_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ def test_load_from_file(self):
model_params = params.pop("model")
assert model_params.pop("type") == "bidaf"

def test_replace_none(self):
params = Params({"a": "None", "b": [1.0, "None", 2], "c": {"d": "None"}})
assert params["a"] is None
assert params["b"][1] is None
assert params["c"]["d"] is None

def test_bad_unicode_environment_variables(self):
filename = self.FIXTURES_ROOT / 'bidaf' / 'experiment.json'
os.environ['BAD_ENVIRONMENT_VARIABLE'] = "\udce2"
Params.from_file(filename)
del os.environ['BAD_ENVIRONMENT_VARIABLE']


def test_overrides(self):
filename = self.FIXTURES_ROOT / 'bidaf' / 'experiment.json'
overrides = '{ "train_data_path": "FOO", "model": { "type": "BAR" },'\
Expand Down Expand Up @@ -147,7 +152,6 @@ def test_jsonnet_features(self):

params.assert_empty("TestParams")


def test_regexes_with_backslashes(self):
bad_regex = self.TEST_DIR / 'bad_regex.jsonnet'
good_regex = self.TEST_DIR / 'good_regex.jsonnet'
Expand Down Expand Up @@ -369,7 +373,6 @@ def from_params(cls, params: Params) -> 'A':
"a.bs.0.c.c_file": my_other_file
}


def test_as_ordered_dict(self):
# keyD > keyC > keyE; keyDA > keyDB; Next all other keys alphabetically
preference_orders = [["keyD", "keyC", "keyE"], ["keyDA", "keyDB"]]
Expand Down
0