From 4f648b0c16135c575eb92830c56f82b711427a78 Mon Sep 17 00:00:00 2001 From: larsevj Date: Tue, 11 Feb 2025 15:02:34 +0100 Subject: [PATCH] Project id cannot be none in get_info --- tests/test_data_loader.py | 10 +++++----- webviz_ert/data_loader/__init__.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_data_loader.py b/tests/test_data_loader.py index 8180351e..85f793cd 100644 --- a/tests/test_data_loader.py +++ b/tests/test_data_loader.py @@ -1,11 +1,11 @@ -from webviz_ert.data_loader import get_ensembles, refresh_data, DataLoader +from webviz_ert.data_loader import get_ensembles, refresh_data -def test_get_ensembles(mock_data): - ensembles = get_ensembles() +def test_get_ensembles(tmp_path, mock_data): + ensembles = get_ensembles(project_id=tmp_path) assert [ensemble["id"] for ensemble in ensembles] == [1, 2, 3, 42] -def test_refresh_data(mock_data): - resp = refresh_data() +def test_refresh_data(tmp_path, mock_data): + resp = refresh_data(project_id=tmp_path) assert resp.status_code == 200 diff --git a/webviz_ert/data_loader/__init__.py b/webviz_ert/data_loader/__init__.py index 8ec81099..d7ef8f88 100644 --- a/webviz_ert/data_loader/__init__.py +++ b/webviz_ert/data_loader/__init__.py @@ -16,7 +16,7 @@ def escape(s: str) -> str: return quote(quote(s, safe="")) -def get_connection_info(project_id: Optional[str] = None) -> Mapping[str, str]: +def get_connection_info(project_id: str) -> Mapping[str, str]: from ert.shared.storage.connection import get_info if project_id not in connection_info_map: @@ -246,13 +246,13 @@ def refresh_data(self) -> requests.Response: return self._post("updates/facade") -def get_data_loader(project_id: Optional[str] = None) -> DataLoader: +def get_data_loader(project_id: str) -> DataLoader: return DataLoader(*(get_connection_info(project_id).values())) -def get_ensembles(project_id: Optional[str] = None) -> list: +def get_ensembles(project_id: str) -> list: return get_data_loader(project_id).get_all_ensembles() -def refresh_data(project_id: Optional[str] = None) -> requests.Response: +def refresh_data(project_id: str) -> requests.Response: return get_data_loader(project_id).refresh_data()