From b2b909c7f694cab54f07d1a3e51909d615c91660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85dne=20Jacobsen?= <88316787+adnejacobsen@users.noreply.github.com> Date: Thu, 7 Sep 2023 06:59:27 +0200 Subject: [PATCH] Include dict (#361) * Add what is required to export dictionaries * Add what is required to export dictionaries * Add some dictionary tests * Make more tests for dictionaries * Add docstring * Change naming of class and go for JSON as only format * Lint * Change docstring * Add in class enum * add as an allowed content * lint --------- Co-authored-by: Daniel Berge Sollien --- schema/definitions/0.8.0/schema/fmu_results.json | 3 ++- src/fmu/dataio/_definitions.py | 1 + tests/test_units/test_dictionary.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/schema/definitions/0.8.0/schema/fmu_results.json b/schema/definitions/0.8.0/schema/fmu_results.json index 0767b067d..e002a0534 100644 --- a/schema/definitions/0.8.0/schema/fmu_results.json +++ b/schema/definitions/0.8.0/schema/fmu_results.json @@ -119,7 +119,8 @@ "polygons", "cube", "well", - "points" + "points", + "dictionary" ] }, "source": { diff --git a/src/fmu/dataio/_definitions.py b/src/fmu/dataio/_definitions.py index a24862ae5..1b2e0648f 100644 --- a/src/fmu/dataio/_definitions.py +++ b/src/fmu/dataio/_definitions.py @@ -64,6 +64,7 @@ def __post_init__(self): "khproduct": None, "timeseries": None, "wellpicks": None, + "parameters": None, } STANDARD_TABLE_INDEX_COLUMNS = { diff --git a/tests/test_units/test_dictionary.py b/tests/test_units/test_dictionary.py index 1c09adc1f..4500f8b6e 100644 --- a/tests/test_units/test_dictionary.py +++ b/tests/test_units/test_dictionary.py @@ -117,7 +117,7 @@ def test_export_dict_w_meta(globalconfig2, dictionary, request): name = dictionary in_dict = request.getfixturevalue(dictionary) print(f"{name}: {in_dict}") - exd = ExportData(config=globalconfig2) + exd = ExportData(config=globalconfig2, content="parameters") out_dict, out_meta = read_dict_and_meta(exd.export(in_dict, name=name)) assert in_dict == out_dict assert_dict_correct(out_dict, out_meta, name) @@ -131,7 +131,7 @@ def test_invalid_dict(globalconfig2, drogon_summary, drogon_volumes): drogon_volumes (pa.Table): a pyarrow table """ in_dict = {"volumes": drogon_volumes, "summary": drogon_summary} - exd = ExportData(config=globalconfig2) + exd = ExportData(config=globalconfig2, content="parameters") with pytest.raises(TypeError) as exc_info: print(exc_info) exd.export(in_dict, name="invalid")