Fix Python-based decorators templating #36103
Merged
Conversation
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
Templating of Python-based decorators has been broken since implementation. The decorators used template_fields definition as defined originally in PythonOperator rather than the ones from virtualenv because template fields were redefined in _PythonDecoratedOperator class and they took precedence (MRU). This PR add explicit copying of template_fields from the operators that they are decorating. Fixes: apache#36102
Member
|
I feel this entire hierarchy of operators needs some revamp, the inheritance is getting too deep and there are too many operator classes. But this is a good first step since it at least gets the behaviour right. |
uranusjr
approved these changes
Dec 7, 2023
Member
uranusjr
left a comment
uranusjr
left a comment
There was a problem hiding this comment.
I am thinking a similar approach to how fsspec reduces the need of n2 operators to 1 operator + n backends.
Member
Author
|
Yeah. It's a bit |
ephraimbuddy
added
the
changelog:skip
ephraimbuddy
added
type:bug-fix
ephraimbuddy
pushed a commit
that referenced
this pull request
Jan 11, 2024
Templating of Python-based decorators has been broken since implementation. The decorators used template_fields definition as defined originally in PythonOperator rather than the ones from virtualenv because template fields were redefined in _PythonDecoratedOperator class and they took precedence (MRU). This PR add explicit copying of template_fields from the operators that they are decorating. Fixes: #36102 (cherry picked from commit 3904206)
68 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Templating of Python-based decorators has been broken since implementation. The decorators used template_fields definition as defined originally in PythonOperator rather than the ones from virtualenv because template fields were redefined in _PythonDecoratedOperator class and they took precedence (MRU).
This PR add explicit copying of template_fields from the operators that they are decorating.
Fixes: #36102
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in newsfragments.