From fc6d51a99996fa7abfc25d69a3796051959741e8 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Mon, 5 Jun 2023 13:31:01 +0100 Subject: [PATCH 1/2] use adjuster by default --- pvnet/app.py | 2 +- tests/conftest.py | 7 +++++++ tests/test_app.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pvnet/app.py b/pvnet/app.py index b0bfc3fa..f527f4cb 100644 --- a/pvnet/app.py +++ b/pvnet/app.py @@ -170,7 +170,7 @@ def convert_df_to_forecasts( return forecasts -def app(t0=None, apply_adjuster=False, gsp_ids=gsp_ids): +def app(t0=None, apply_adjuster=True, gsp_ids=gsp_ids): """Inference function for production This app expects these evironmental variables to be available: diff --git a/tests/conftest.py b/tests/conftest.py index d1ed0981..d5a182c3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -20,6 +20,7 @@ Location, LocationSQL, ) +from nowcasting_datamodel.fake import make_fake_me_latest xr.set_options(keep_attrs=True) @@ -269,3 +270,9 @@ def multimodal_model_kwargs(model_minutes_kwargs): ) kwargs.update(model_minutes_kwargs) return kwargs + +@pytest.fixture() +def me_latest(db_session): + metric_values = make_fake_me_latest(session=db_session, model_name="pvnet_v2") + db_session.add_all(metric_values) + db_session.commit() \ No newline at end of file diff --git a/tests/test_app.py b/tests/test_app.py index 3c4ee49f..fa92e806 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -11,7 +11,7 @@ ) -def test_app(db_session, nwp_data, sat_data, gsp_yields_and_systems): +def test_app(db_session, nwp_data, sat_data, gsp_yields_and_systems, me_latest): # Environment variable DB_URL is set in engine_url, which is called by db_session # set NWP_ZARR_PATH # save nwp_data to temporary file, and set NWP_ZARR_PATH From b5fc7fb44032b4958a112fd83b6625075d211c3b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 12:38:51 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index d5a182c3..be876767 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -271,8 +271,9 @@ def multimodal_model_kwargs(model_minutes_kwargs): kwargs.update(model_minutes_kwargs) return kwargs + @pytest.fixture() def me_latest(db_session): metric_values = make_fake_me_latest(session=db_session, model_name="pvnet_v2") db_session.add_all(metric_values) - db_session.commit() \ No newline at end of file + db_session.commit()