From 728fba8d67a25831b9ff46ab317c49b541317552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Eide?= Date: Fri, 5 Jan 2024 15:33:26 +0100 Subject: [PATCH] Remove keys argument --- src/ert/dark_storage/common.py | 4 ++-- src/ert/storage/local_ensemble.py | 8 -------- tests/unit_tests/test_libres_facade.py | 12 +++++------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/ert/dark_storage/common.py b/src/ert/dark_storage/common.py index 2bf15d8cfd3..8d12e3f91d7 100644 --- a/src/ert/dark_storage/common.py +++ b/src/ert/dark_storage/common.py @@ -31,8 +31,8 @@ def get_response_names(ensemble: EnsembleReader) -> List[str]: def get_response(ensemble: EnsembleReader, key: str) -> pd.DataFrame: if key in ensemble.get_summary_keyset(): - data = ensemble.load_all_summary_data([key]) - data = data[key].unstack(level="Date") + data = ensemble.load_all_summary_data() + data = data[[key]].unstack(level="Date") elif key in ensemble.get_gen_data_keyset(): key_parts = key.split("@") key = key_parts[0] diff --git a/src/ert/storage/local_ensemble.py b/src/ert/storage/local_ensemble.py index 033177920f1..ee48d92df18 100644 --- a/src/ert/storage/local_ensemble.py +++ b/src/ert/storage/local_ensemble.py @@ -369,7 +369,6 @@ def load_responses( @deprecated("Use load_responses") def load_all_summary_data( self, - keys: Optional[List[str]] = None, realization_index: Optional[int] = None, ) -> pd.DataFrame: realizations = self.get_realization_list_with_responses() @@ -378,8 +377,6 @@ def load_all_summary_data( raise IndexError(f"No such realization {realization_index}") realizations = [realization_index] - summary_keys = self.get_summary_keyset() - try: df = self.load_responses("summary", tuple(realizations)).to_dataframe() except (ValueError, KeyError): @@ -389,11 +386,6 @@ def load_all_summary_data( df.index = df.index.rename( {"time": "Date", "realization": "Realization"} ).reorder_levels(["Realization", "Date"]) - if keys: - summary_keys = sorted( - [key for key in keys if key in summary_keys] - ) # ignore keys that doesn't exist - return df[summary_keys] return df def load_all_gen_kw_data( diff --git a/tests/unit_tests/test_libres_facade.py b/tests/unit_tests/test_libres_facade.py index 1a9ea0c9ca1..034b2e5fbd3 100644 --- a/tests/unit_tests/test_libres_facade.py +++ b/tests/unit_tests/test_libres_facade.py @@ -58,7 +58,7 @@ def test_keyword_type_checks_missing_key(snake_oil_default_storage): def test_data_fetching_missing_key(empty_case): data = [ - empty_case.load_all_summary_data(["nokey"]), + empty_case.load_all_summary_data(), empty_case.load_all_gen_kw_data("nokey", None), ] @@ -163,7 +163,7 @@ def test_summary_data_verify_indices_and_values( caplog, snake_oil_default_storage, snapshot ): with caplog.at_level(logging.WARNING): - data = snake_oil_default_storage.load_all_summary_data(["FOPR"]) + data = snake_oil_default_storage.load_all_summary_data()[["FOPR"]] data = data.unstack(level="Realization") snapshot.assert_match( data.iloc[:5].to_csv(), @@ -238,7 +238,7 @@ def test_summary_collector( # realization 60: _ = data.loc[60] - data = snake_oil_default_storage.load_all_summary_data(["WWCT:OP1", "WWCT:OP2"]) + data = snake_oil_default_storage.load_all_summary_data()[["WWCT:OP1", "WWCT:OP2"]] snapshot.assert_match(data.iloc[:4].to_csv(), "summary_collector_2.csv") assert data.shape == (1000, 2) with pytest.raises(KeyError): @@ -246,17 +246,15 @@ def test_summary_collector( realization_index = 4 data = snake_oil_default_storage.load_all_summary_data( - ["WWCT:OP1", "WWCT:OP2"], realization_index=realization_index, - ) + )[["WWCT:OP1", "WWCT:OP2"]] snapshot.assert_match(data.iloc[:4].to_csv(), "summary_collector_3.csv") assert data.shape == (200, 2) non_existing_realization_index = 150 with pytest.raises(IndexError): _ = snake_oil_default_storage.load_all_summary_data( - ["WWCT:OP1", "WWCT:OP2"], realization_index=non_existing_realization_index, - ) + )[["WWCT:OP1", "WWCT:OP2"]] def test_misfit_collector(snake_oil_case_storage, snake_oil_default_storage, snapshot):