Allow concat of history and summary obs#12674
Merged
SAKavli merged 5 commits intoequinor:mainfrom Jan 20, 2026
Merged
Conversation
This applies to Summary and History observations - as these are strictly speaking the same type. As they are concatinated, we need their dataframe to be of same width.
This allows SummaryObservations and HistoryObservations to be concatinated to a single table - as this requires the same column-type.
SAKavli
force-pushed
the
allow-concat-of-history-and-summary-obs
branch
from
8c88bd1 to
2b9b7a4
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #12674 +/- ##
==========================================
- Coverage 90.68% 90.64% -0.04%
==========================================
Files 429 430 +1
Lines 29808 29814 +6
==========================================
- Hits 27030 27026 -4
- Misses 2778 2788 +10
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
CodSpeed Performance ReportMerging this PR will not alter performanceComparing Summary
|
SAKavli
added
the
release-notes:bug-fix
There was a problem hiding this comment.
Pull request overview
This PR adds location-related fields (location_x, location_y, location_range) to observation dataframes to enable concatenation of history and summary observations. The changes include a storage migration (to version 22), updates to observation creation logic, and comprehensive test coverage.
Changes:
- Adds three location fields with Float32 dtype and None defaults to both history and summary observations
- Implements storage migration to22 for backward compatibility
- Updates observation creation to consistently include location fields
- Adds tests for migration and new functionality
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
src/ert/storage/migration/to22.py |
New migration adding location fields to existing summary observations |
src/ert/storage/local_storage.py |
Storage version bump to 22 and migration registration |
src/ert/config/_create_observation_dataframes.py |
Updated observation creation to include location fields |
tests/ert/unit_tests/storage/migration/test_to22.py |
Migration tests covering various scenarios |
tests/ert/unit_tests/config/test_summary_config.py |
Tests for location field handling |
| Snapshot files (3 files) | Updated snapshots with new location fields |
SAKavli
force-pushed
the
allow-concat-of-history-and-summary-obs
branch
from
d65c0c2 to
e5d51b0
Compare
eivindjahren
approved these changes
Jan 20, 2026
Contributor
eivindjahren
left a comment
eivindjahren
left a comment
There was a problem hiding this comment.
Looks good! Difficult to be sure about these snapshots, but they only add location info so it is rather minor.
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin version-19.0
git worktree add -d .worktree/backport-12674-to-version-19.0 origin/version-19.0
cd .worktree/backport-12674-to-version-19.0
git switch --create backport-12674-to-version-19.0
git cherry-pick -x 7238d60a03af865889e22d8d61f62471e103a450 |
github-actions bot
pushed a commit
that referenced
this pull request
Jan 27, 2026
* Add default Null localization values This applies to Summary and History observations - as these are strictly speaking the same type. As they are concatinated, we need their dataframe to be of same width. * Consistently use pl.Float32 for localization This allows SummaryObservations and HistoryObservations to be concatinated to a single table - as this requires the same column-type. * Update snapshots * Create storage migration (cherry picked from commit 7238d60)
|
Successfully created backport PR for |
SAKavli
added a commit
that referenced
this pull request
Jan 27, 2026
* Add default Null localization values This applies to Summary and History observations - as these are strictly speaking the same type. As they are concatinated, we need their dataframe to be of same width. * Consistently use pl.Float32 for localization This allows SummaryObservations and HistoryObservations to be concatinated to a single table - as this requires the same column-type. * Update snapshots * Create storage migration (cherry picked from commit 7238d60)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue
Resolves #12620
Will squash partially or completely