Skip to content

Remove mxalign testing functionality #15

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

Open
leifdenby wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove mxalign testing functionality #15

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
2 changes: 0 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ where = ["src"]
testpaths = ["tests"]

[tool.uv.sources]
mxalign = { git = "https://github.com/mlwp-tools/mxalign", rev = "e2232d93275c7508897a7ddb0cce8b508665f24c" }
mlwp-data-specs = { git = "https://github.com/mlwp-tools/mlwp-data-specs", rev = "059f382" }

[dependency-groups]
Expand All @@ -52,6 +51,5 @@ dev = [
"pooch>=1.9.0",
]
test = [
"mxalign",
"pooch",
]
102 changes: 0 additions & 102 deletions src/mlwp_data_loaders/mxalign_api.py
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions tests/test_anemoi_datasets_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@

from __future__ import annotations

from mlwp_data_specs.api import (
SPACE_TRAIT_ATTR,
TIME_TRAIT_ATTR,
UNCERTAINTY_TRAIT_ATTR,
)

from mlwp_data_loaders.api import load_and_validate_dataset
from mlwp_data_loaders.mxalign_api import validate_dataset_with_mxalign

# Use small CERRA sample dataset stored on EWC (European Weather Cloud)
# S3-compatible object store for testing.
Expand All @@ -36,18 +29,6 @@ def test_load_dataset_opens_anemoi_store_from_ewc() -> None:
return_validation_report=True,
)

# Note: mxalign validation is temporarily kept here during early development
# to ensure `mlwp-data-specs` behaves identically. It will eventually be removed.
report_mxalign = validate_dataset_with_mxalign(
ds,
time=ds.attrs.get(TIME_TRAIT_ATTR),
space=ds.attrs.get(SPACE_TRAIT_ATTR),
uncertainty=ds.attrs.get(UNCERTAINTY_TRAIT_ATTR),
)
if report_mxalign.has_fails():
report_mxalign.console_print()
assert not report_mxalign.has_fails()

if report_specs.has_fails():
report_specs.console_print()
assert not report_specs.has_fails()
17 changes: 0 additions & 17 deletions tests/test_anemoi_inference_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@

from __future__ import annotations

from mlwp_data_specs.api import (
SPACE_TRAIT_ATTR,
TIME_TRAIT_ATTR,
UNCERTAINTY_TRAIT_ATTR,
)

from mlwp_data_loaders.api import load_and_validate_dataset
from mlwp_data_loaders.mxalign_api import validate_dataset_with_mxalign

DATASET_PATH = [
"s3://mlwp-sample-datasets/anemoi-inference/unknown-revision/"
Expand Down Expand Up @@ -37,16 +30,6 @@ def test_load_dataset_opens_anemoi_inference_from_ewc() -> None:
return_validation_report=True,
)

report_mxalign = validate_dataset_with_mxalign(
ds,
time=ds.attrs.get(TIME_TRAIT_ATTR),
space=ds.attrs.get(SPACE_TRAIT_ATTR),
uncertainty=ds.attrs.get(UNCERTAINTY_TRAIT_ATTR),
)
if report_mxalign.has_fails():
report_mxalign.console_print()
assert not report_mxalign.has_fails()

if report_specs.has_fails():
report_specs.console_print()
assert not report_specs.has_fails()
58 changes: 0 additions & 58 deletions tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,10 @@
import pytest
import xarray as xr

import mlwp_data_loaders.mxalign_api as mxalign_api
from mlwp_data_loaders.api import load_and_validate_dataset
from mlwp_data_loaders.core import get_loader_func


def _forecast_grid_ds() -> xr.Dataset:
"""Create a forecast + grid dataset for loader tests."""
ds = xr.Dataset(
coords={
"reference_time": ("reference_time", [0]),
"lead_time": ("lead_time", [1]),
"longitude": ("longitude", [10.0, 11.0]),
"latitude": ("latitude", [60.0, 61.0]),
}
)
ds.coords["reference_time"].attrs["standard_name"] = "forecast_reference_time"
ds.coords["lead_time"].attrs.update(
{"standard_name": "forecast_period", "units": "hours"}
)
ds.coords["longitude"].attrs.update(
{"standard_name": "longitude", "units": "degrees_east"}
)
ds.coords["latitude"].attrs.update(
{"standard_name": "latitude", "units": "degrees_north"}
)
return ds


def test_get_loader_func_raises_missing_load_dataset(tmp_path) -> None:
"""Loader modules must define a 'load_dataset' function."""
loader_file = tmp_path / "loader_missing.py"
Expand Down Expand Up @@ -109,37 +85,3 @@ def has_fails(self):
assert isinstance(ds, xr.Dataset)
assert not report.has_fails()
assert ds.attrs.get("mlwp_time_trait") == "forecast"


def test_validate_dataset_with_mxalign_returns_fail_report_for_invalid_dims(
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""mxalign validation failures are converted into report entries."""

def mock_load_symbols():
def mock_validate(ds, props):
raise ValueError("Mock mxalign validation failed")

return {
"Properties": lambda time, space, uncertainty: "props",
"Space": lambda x: x,
"Time": lambda x: x,
"Uncertainty": lambda x: x,
"validate_dataset": mock_validate,
}

monkeypatch.setattr(
"mlwp_data_loaders.mxalign_api._load_mxalign_validation_symbols",
mock_load_symbols,
)

report = mxalign_api.validate_dataset_with_mxalign(
_forecast_grid_ds(),
time="observation",
space="point",
uncertainty="deterministic",
)

assert report.has_fails()
assert len(report.results) == 1
assert report.results[0].section == "MXAlign Properties"
18 changes: 0 additions & 18 deletions tests/test_harp_obstable_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@

import pooch
import pytest
from mlwp_data_specs.api import (
SPACE_TRAIT_ATTR,
TIME_TRAIT_ATTR,
UNCERTAINTY_TRAIT_ATTR,
)

from mlwp_data_loaders.api import load_and_validate_dataset
from mlwp_data_loaders.mxalign_api import validate_dataset_with_mxalign

HARP_DATA_URL = "https://raw.githubusercontent.com/harphub/harpData/master/inst/OBSTABLE/OBSTABLE_2019.sqlite"
HARP_DATA_HASH = "bdab991c287a41871488456d1a9d697942aa3a612800a88264defa312a9d637b"
Expand All @@ -35,18 +29,6 @@ def test_load_dataset_opens_harp_obstable(obstable_path: str) -> None:
return_validation_report=True,
)

# Note: mxalign validation is temporarily kept here during early development
# to ensure `mlwp-data-specs` behaves identically. It will eventually be removed.
report_mxalign = validate_dataset_with_mxalign(
ds,
time=ds.attrs.get(TIME_TRAIT_ATTR),
space=ds.attrs.get(SPACE_TRAIT_ATTR),
uncertainty=ds.attrs.get(UNCERTAINTY_TRAIT_ATTR),
)
if report_mxalign.has_fails():
report_mxalign.console_print()
assert not report_mxalign.has_fails()

if report_specs.has_fails():
report_specs.console_print()
assert not report_specs.has_fails()
Loading