Update BaseModelWithContext with extra=forbid and fix tests#13457
Open
Update BaseModelWithContext with extra=forbid and fix tests#13457
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR tightens Pydantic validation for ERT models by making BaseModelWithContextSupport forbid unknown fields, then adjusts affected run-model construction and unit tests to comply (issue #13444).
Changes:
- Configure
BaseModelWithContextSupportto useextra="forbid"(and update downstream call sites/tests impacted by stricter validation). - Update run-model serialization roundtrip tests to avoid validating computed/serialized-only fields.
- Adjust Everest/ManualUpdate run-model construction/config so instantiation works under
extra="forbid".
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
src/ert/base_model_context.py |
Makes context-enabled Pydantic base model forbid extra fields (and also enables arbitrary types). |
src/ert/run_models/everest_run_model.py |
Adds fields to EverestRunModelConfig to satisfy stricter model validation; introduces optimization_callback handling as a config field. |
src/ert/run_models/model_factory.py |
Stops passing observations into ManualUpdateConfig (now forbidden as an extra field). |
tests/ert/unit_tests/run_models/test_experiment_serialization.py |
Excludes experiment_type from dumped payload when re-validating runmodels (to avoid extra="forbid" failures). |
tests/ert/unit_tests/ensemble_evaluator/conftest.py |
Removes unsupported job_script argument from QueueConfig fixture construction. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #13457 +/- ##
==========================================
- Coverage 90.05% 89.93% -0.12%
==========================================
Files 459 459
Lines 32040 32182 +142
==========================================
+ Hits 28853 28944 +91
- Misses 3187 3238 +51
Flags with carried forward coverage won't be shown. Click here to find out more.
|
erlenlh
force-pushed
the
update-base-model-with-context-support
branch
from
74d18a9 to
e138a24
Compare
erlenlh
force-pushed
the
update-base-model-with-context-support
branch
from
e138a24 to
dda17fb
Compare
erlenlh
force-pushed
the
update-base-model-with-context-support
branch
from
dda17fb to
dcf4875
Compare
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 #13444
Approach
Add extra=forbid flag to BaseModelWithContextSupport. Deal with downstream effect, adding to models or removing from tests where it seems fit.
(Screenshot of new behavior in GUI if applicable)
git rebase -i main --exec 'just rapid-tests')When applicable