Remove keys argument

oyvindeide · Feb 1, 2024 · 5d2375b · 5d2375b
1 parent f6362b0
commit 5d2375b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/src/ert/storage/local_ensemble.py b/src/ert/storage/local_ensemble.py
@@ -406,7 +406,6 @@ def load_summary(self, key: str) -> pd.DataFrame:
     @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()
@@ -415,8 +414,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):
@@ -427,11 +424,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
@@ -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),
     ]
 
@@ -161,7 +161,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(),
@@ -280,25 +280,23 @@ 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):
         _ = data["FOPR"]
 
     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):