Skip to content
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.

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

Project id cannot be none in get_info #479

Merged
merged 1 commit into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions tests/test_data_loader.py
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions webviz_ert/data_loader/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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()