From 372d5f6e9e2b21706fb4d141ff72c70f4adb9450 Mon Sep 17 00:00:00 2001
From: Eivind Jahren <ejah@equinor.com>
Date: Mon, 14 Oct 2024 12:07:33 +0200
Subject: [PATCH] Ensure non-existent gen_kw does not error in dark_storage

---
 src/ert/dark_storage/common.py                |  2 +-
 .../gui/tools/plot/test_plot_api.py           | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/ert/dark_storage/common.py b/src/ert/dark_storage/common.py
index 4dac30ba4cd..dc97e7127b1 100644
--- a/src/ert/dark_storage/common.py
+++ b/src/ert/dark_storage/common.py
@@ -160,7 +160,7 @@ def data_for_key(
         dataframe.index.name = "Realization"
 
         data = dataframe.sort_index(axis=1)
-        if data.empty:
+        if data.empty or key not in data:
             return pd.DataFrame()
         data = data[key].to_frame().dropna()
         data.columns = pd.Index([0])
diff --git a/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py b/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py
index 1e9a7acb8f2..5e0008928e1 100644
--- a/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py
+++ b/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py
@@ -283,3 +283,42 @@ def test_plot_api_handles_empty_gen_kw(tmp_path, monkeypatch):
             enkf._storage.close()
         enkf._storage = None
         gc.collect()
+
+
+def test_plot_api_handles_non_existant_gen_kw(tmp_path, monkeypatch):
+    with open_storage(tmp_path / "storage", mode="w") as storage:
+        monkeypatch.setenv("ERT_STORAGE_NO_TOKEN", "yup")
+        monkeypatch.setenv("ERT_STORAGE_ENS_PATH", storage.path)
+        api = PlotApi()
+        experiment = storage.create_experiment(
+            parameters=[
+                GenKwConfig(
+                    name="gen_kw",
+                    forward_init=False,
+                    update=False,
+                    template_file=None,
+                    output_file=None,
+                    transform_function_definitions=[],
+                ),
+            ],
+            responses=[],
+            observations={},
+        )
+        ensemble = storage.create_ensemble(experiment.id, ensemble_size=10)
+        ensemble.save_parameters(
+            "gen_kw",
+            1,
+            xr.Dataset(
+                {
+                    "values": ("names", [1.0]),
+                    "transformed_values": ("names", [1.0]),
+                    "names": ["key"],
+                }
+            ),
+        )
+        assert api.data_for_key(str(ensemble.id), "gen_kw").empty
+        assert api.data_for_key(str(ensemble.id), "gen_kw:does_not_exist").empty
+        if enkf._storage is not None:
+            enkf._storage.close()
+        enkf._storage = None
+        gc.collect()