wip

Author: SAKavli

src/ert/observation_converters/summary_to_yaml.py

@@ -1,11 +1,11 @@
-import warnings
 from pathlib import Path
 from typing import Literal, TypedDict
 
 from ruamel.yaml import YAML
 
 from ert.cli.main import ErtCliError
-from ert.config import ErtConfig, Observation
+from ert.config import ErtConfig, ObservationType
+from ert.config.parsing import ObservationDict, read_file
 
 
 class YamlObservation(TypedDict):
@@ -25,25 +25,28 @@ class SummaryDict(TypedDict):
 class YamlConverter:
     target_file = "summary_observations.yaml"
 
-    def __init__(self, observations: list[Observation]) -> None:
+    def __init__(self, observations: list[ObservationDict]) -> None:
         summary_observations = [
-            o for o in observations if o.type == "summary_observation"
+            o for o in observations if o["type"] == ObservationType.SUMMARY
         ]
         if not summary_observations:
-            raise ErtCliError("No summary observations found.\nExiting ...")
+            raise ErtCliError("No summary observations in configuration.\nExiting ...")
 
         self.summary_observations = summary_observations
 
     def _summary_to_yaml_dict(self) -> YamlDict:
-        summary_observations = [
-            o for o in self.summary_observations if o.type == "summary_observation"
-        ]
-        summary_keys: set[str] = {o.key for o in summary_observations}
+        summary_keys: set[str] = {str(o["KEY"]) for o in self.summary_observations}
         summary_list: list[SummaryDict] = []
         for key in summary_keys:
-            observations_with_key = [o for o in summary_observations if o.key == key]
+            observations_with_key = [
+                o for o in self.summary_observations if o["KEY"] == key
+            ]
             obs_dicts: list[YamlObservation] = [
-                {"date": o.date, "value": o.value, "error": o.error}
+                {
+                    "date": str(o["DATE"]),
+                    "value": float(o["VALUE"]),
+                    "error": float(o["ERROR"]),
+                }
                 for o in observations_with_key
             ]
             summary_dict: SummaryDict = {"key": key, "observations": obs_dicts}
@@ -64,10 +67,17 @@ def export_yaml(self) -> None:
 
 
 def convert_summary_to_yaml(config: str) -> None:
-    with warnings.catch_warnings(action="ignore"):
-        ert_config = ErtConfig.from_file(config)
+    user_config_contents = read_file(config)
+    config_dict = ErtConfig._config_dict_from_contents(
+        user_config_contents,
+        config,
+    )
+    file, obs_config = config_dict.get("OBS_CONFIG", (None, None))
+
+    if file is None or config_dict is None:
+        raise ErtCliError("No observation configuration found.\nExiting ...")
 
     yaml_exporter = YamlConverter(
-        observations=ert_config.observation_declarations,
+        observations=obs_config,
     )
     yaml_exporter.export_yaml()

tests/ert/unit_tests/cli/test_summary_to_yaml.py

@@ -7,10 +7,28 @@
 import pytest
 
 from ert.cli.main import ErtCliError
-from ert.config._observations import GeneralObservation
+from ert.config import ObservationType
+from ert.config.parsing import ObservationDict
 from ert.observation_converters import convert_observations
 from ert.observation_converters.summary_to_yaml import YamlConverter
-from tests.ert.unit_tests.cli.test_summary_to_bulk import _make_summary_obs
+
+
+def _make_obs_dict(
+    obs_type: ObservationType = ObservationType.SUMMARY,
+    key: str = "WOPR",
+    well: str = "OP1",
+) -> ObservationDict:
+    key = f"{key}:{well}" if well else key
+    return ObservationDict(
+        {
+            "type": obs_type,
+            "KEY": key,
+            "ERROR": 5,
+            "VALUE": 10,
+            "DATE": "2010-10-10",
+        },
+        context=MagicMock(),
+    )
 
 
 @pytest.mark.usefixtures("snake_oil_case")
@@ -22,22 +40,22 @@ def test_that_happy_path_on_snake_oil_produces_yaml_and_stdout(capsys):
     smry:
     - key: WOPR:OP1
       observations:
-      - date: '2010-03-31T00:00:00'
+      - date: '2010-03-31'
         value: 0.1
         error: 0.05
-      - date: '2010-12-26T00:00:00'
+      - date: '2010-12-26'
         value: 0.7
         error: 0.07
-      - date: '2011-12-21T00:00:00'
+      - date: '2011-12-21'
         value: 0.5
         error: 0.05
-      - date: '2012-12-15T00:00:00'
+      - date: '2012-12-15'
         value: 0.3
         error: 0.075
-      - date: '2013-12-10T00:00:00'
+      - date: '2013-12-10'
         value: 0.2
         error: 0.035
-      - date: '2015-03-15T00:00:00'
+      - date: '2015-03-15'
         value: 0.015
         error: 0.01
     """)
@@ -52,23 +70,21 @@ def test_that_happy_path_on_snake_oil_produces_yaml_and_stdout(capsys):
 
 
 def test_that_empty_observations_raises_ert_cli_error():
-    with pytest.raises(ErtCliError, match="No summary observations found"):
+    with pytest.raises(ErtCliError, match="No summary observations in configuration"):
         YamlConverter([])
 
 
 def test_that_no_summary_observations_raises_ert_cli_error():
-    gen_obs = GeneralObservation(
-        name="foo", data="foo", value=1.0, error=1.0, restart=5, index=5
-    )
-    with pytest.raises(ErtCliError, match="No summary observations found"):
+    gen_obs = _make_obs_dict(obs_type=ObservationType.GENERAL)
+    with pytest.raises(ErtCliError, match="No summary observations in configuration"):
         YamlConverter([gen_obs])
 
 
 def test_that_observations_with_same_summary_key_are_gathered_in_yaml_dict(use_tmpdir):
     k1, k2 = "foo", "bar"
     observations = 2 * [
-        _make_summary_obs(key=k1, well=None),
-        _make_summary_obs(key=k2, well=None),
+        _make_obs_dict(key=k1, well=""),
+        _make_obs_dict(key=k2, well=""),
     ]
 
     converter = YamlConverter(observations=observations)
@@ -85,8 +101,8 @@ def test_that_observations_with_same_summary_key_are_gathered_in_yaml_dict(use_t
 def test_that_observations_with_different_summary_keys_are_separated_in_yaml_dict():
     k1, k2 = "foo", "bar"
     observations = [
-        _make_summary_obs(key=k1, well=None),
-        _make_summary_obs(key=k2, well=None),
+        _make_obs_dict(key=k1, well=""),
+        _make_obs_dict(key=k2, well=""),
     ]
 
     converter = YamlConverter(observations=observations)
@@ -98,7 +114,7 @@ def test_that_observations_with_different_summary_keys_are_separated_in_yaml_dic
 
 
 def test_that_dumping_to_yaml_is_skipped_when_file_already_exists(use_tmpdir):
-    observations = [_make_summary_obs()]
+    observations = [_make_obs_dict()]
 
     Path("summary_observations.yaml").write_text("existing", encoding="utf-8")
     assert Path("summary_observations.yaml").is_file()