Skip to content

Check kwargs valid #292

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

Check kwargs valid #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f5167
test_skill_bad_args
jsmariegaard Dec 1, 2023
47e1c38
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"
jsmariegaard Dec 1, 2023
55b0b3b
missing
jsmariegaard Dec 2, 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
6 changes: 6 additions & 0 deletions modelskill/comparison/_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ def skill(
# TODO remove in v1.1
model, start, end, area = _get_deprecated_args(kwargs)
observation, variable = _get_deprecated_obs_var_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

cmp = self.sel(
model=model,
Expand Down Expand Up @@ -530,6 +531,7 @@ def spatial_skill(

model, start, end, area = _get_deprecated_args(kwargs)
observation, variable = _get_deprecated_obs_var_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

metrics = _parse_metric(metrics, self.metrics, return_list=True)

Expand Down Expand Up @@ -677,6 +679,7 @@ def mean_skill(
# TODO remove in v1.1
model, start, end, area = _get_deprecated_args(kwargs)
observation, variable = _get_deprecated_obs_var_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

# filter data
cmp = self.sel(
Expand Down Expand Up @@ -769,6 +772,7 @@ def mean_skill_points(
# TODO remove in v1.1
model, start, end, area = _get_deprecated_args(kwargs)
observation, variable = _get_deprecated_obs_var_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

# filter data
cmp = self.sel(
Expand Down Expand Up @@ -905,6 +909,7 @@ def score(

model, start, end, area = _get_deprecated_args(kwargs)
observation, variable = _get_deprecated_obs_var_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

if model is None:
models = self.mod_names
Expand Down Expand Up @@ -960,6 +965,7 @@ def taylor(

model, start, end, area = _get_deprecated_args(kwargs)
observation, variable = _get_deprecated_obs_var_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

cmp = self.sel(
model=model,
Expand Down
3 changes: 3 additions & 0 deletions modelskill/comparison/_comparison.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,7 @@ def skill(

# TODO remove in v1.1
model, start, end, area = _get_deprecated_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

cmp = self.sel(
model=model,
Expand Down Expand Up @@ -1026,6 +1027,7 @@ def score(

# TODO remove in v1.1
model, start, end, area = _get_deprecated_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

s = self.skill(
metrics=[metric],
Expand Down Expand Up @@ -1108,6 +1110,7 @@ def spatial_skill(

# TODO remove in v1.1
model, start, end, area = _get_deprecated_args(kwargs)
assert kwargs == {}, f"Unknown keyword arguments: {kwargs}"

cmp = self.sel(
model=model,
Expand Down
5 changes: 5 additions & 0 deletions tests/test_aggregated_skill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ def test_skill(cc1):
assert "bias" in repr(s)


def test_skill_bad_args(cc1):
with pytest.raises(AssertionError):
cc1.skill(nonexisting_arg=1)


def test_skill_multi_model(cc2):
s = cc2.skill(metrics=["rmse", "bias"])

Expand Down