Add APISettings setting group
#15701
Merged
Conversation
This file contains 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
desertaxle
commented
Oct 15, 2024
Comment on lines
+482
to
+492
| for key in self.model_fields.keys(): | ||
| if isinstance(child_settings := getattr(self, key), PrefectBaseSettings): | ||
| child_env = child_settings.to_environment_variables( | ||
| exclude_unset=exclude_unset, | ||
| include_secrets=include_secrets, | ||
| ) | ||
| env_variables.update(child_env) | ||
| elif (value := env.get(key)) is not None: | ||
| env_variables[ | ||
| f"{self.model_config.get('env_prefix')}{key.upper()}" | ||
| ] = str(value) |
There was a problem hiding this comment.
The fix for to_environment_variables was to iterate over the model_fields because nested model changes weren't included when exclude_unset=True.
desertaxle
commented
Oct 15, 2024
Comment on lines
+495
to
+500
| @model_serializer( | ||
| mode="wrap", when_used="always" | ||
| ) # TODO: reconsider `when_used` default for more control | ||
| def ser_model( | ||
| self, handler: SerializerFunctionWrapHandler, info: SerializationInfo | ||
| ) -> Any: |
There was a problem hiding this comment.
Moved the model serializer to PrefectBaseSettings to ensure all nested models respect include_secrets.
CodSpeed Performance ReportMerging #15701 will not alter performanceComparing Summary
|
zzstoatzz
approved these changes
Oct 15, 2024
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.
Reintroduces changes first introduced in #15580 with fixes to ensure nested models are included when calling
.to_environment_variables().See comments below for where this PR differs from #15580.