Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport gendata migration fix #9049

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/ert/storage/migration/to7.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,7 @@ def _migrate_response_datasets(path: Path) -> None:
responses_obj is not None
), f"Failed to load responses.json @ {responses_file}"

gendata_keys = {
k for k, v in responses_obj.items() if v["_ert_kind"] == "GenDataConfig"
}
gendata_keys = responses_obj.get("gen_data", {}).get("keys", [])

for ens in ensembles:
with open(ens / "index.json", encoding="utf-8") as f:
Expand Down Expand Up @@ -134,5 +132,5 @@ def _migrate_response_datasets(path: Path) -> None:


def migrate(path: Path) -> None:
_migrate_response_datasets(path)
_migrate_response_configs(path)
_migrate_response_datasets(path)
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
realization,name,index,report_step,values
0,GEN,0,1,0.0
0,GEN,1,1,0.0
1,GEN,0,1,0.0
1,GEN,1,1,0.0
2,GEN,0,1,0.0
2,GEN,1,1,0.0
3,GEN,0,1,0.0
3,GEN,1,1,0.0
4,GEN,0,1,0.0
4,GEN,1,1,0.0
5,GEN,0,1,0.1
5,GEN,1,1,0.1
6,GEN,0,1,0.1
6,GEN,1,1,0.1
7,GEN,0,1,0.1
7,GEN,1,1,0.1
8,GEN,0,1,0.1
8,GEN,1,1,0.1
9,GEN,0,1,0.1
9,GEN,1,1,0.1
12 changes: 12 additions & 0 deletions tests/unit_tests/storage/test_storage_migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,18 @@ def test_that_storage_matches(
"observations",
)

gen_data = ensemble.load_responses(
"gen_data", tuple(range(ensemble.ensemble_size))
)
snapshot.assert_match(
gen_data.to_dataframe(
dim_order=["realization", "name", "index", "report_step"]
)
.transform(np.sort)
.to_csv(),
"gen_data",
)


@pytest.mark.integration_test
@pytest.mark.usefixtures("copy_shared")
Expand Down
Loading