Simplify version-specific imports in the Google provider #56793
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
boring-cyborg
bot
added
area:dev-tools
area:providers
backport-to-v3-1-test
kaxil
removed
the
backport-to-v3-1-test
kaxil
requested review from
amoghrajesh,
ashb,
bugraoz93,
eladkal,
gopidesupavan,
jason810496,
jscheffl and
potiuk
as code owners
eladkal
approved these changes
Oct 18, 2025
jason810496
approved these changes
Oct 18, 2025
Member
jason810496
left a comment
jason810496
left a comment
There was a problem hiding this comment.
Does it means that all providers should leverage new common.compact.lazy_compact instead of their provider specific version_compat module?
If so, will we create meta issue for migration and invite the community to help?
potiuk
reviewed
Oct 18, 2025
Member
Once we get this one in as an example I guess :) ? |
potiuk
reviewed
Oct 18, 2025
potiuk
reviewed
Oct 18, 2025
…y_compat Simplify version-specific imports in the Google provider by using lazy_compat for components that are available since Airflow 3.0. This reduces code duplication and leverages the centralized compatibility layer. Changes: - version_compat.py: Use lazy_compat for BaseOperatorLink, BaseSensorOperator, PokeReturnValue, timeout - cloud/links/base.py: Use lazy_compat for XCom import - marketing_platform/links/analytics_admin.py: Use lazy_compat for BaseOperatorLink and XCom Note: BaseHook and BaseOperator imports in version_compat.py remain unchanged as they require AIRFLOW_V_3_1_PLUS conditional logic (not 3.0) due to SDK compatibility. Benefits: - Removed try/except import logic for timeout - Removed if/else blocks for SDK components - Consistent compatibility imports across providers Remove lazy_compat re-exports from Google version_compat.py Remove BaseOperatorLink, BaseSensorOperator, PokeReturnValue, and timeout from version_compat.py. Files that need these imports now import them directly from airflow.providers.common.compat.lazy_compat. This simplifies version_compat.py to only handle version constants and the BaseHook/BaseOperator imports that require special 3.1+ logic. Changes: - version_compat.py: Removed lazy_compat re-exports - bigquery.py sensor: Import BaseSensorOperator from lazy_compat - dataflow.py sensor: Import BaseSensorOperator, PokeReturnValue from lazy_compat - dataproc.py links: Import BaseOperatorLink from lazy_compat - dataflow.py hook: Import timeout from lazy_compat Benefits: - Clearer separation of concerns - Direct imports show the true source of compatibility logic - version_compat.py focuses only on version-specific logic
kaxil
force-pushed
the
bkp-compat-imports
branch
from
b8c1033 to
dec80cf
Compare
Member
Author
Not yet :) But eventually after this PR is merged and probably one or two critical ones. |
potiuk
approved these changes
Oct 18, 2025
Member
Yeah.... Do it once, do it twice, figure out if repeatable and document -> then fire it in massive parallel way. Parallelising too early might result in parallleling wrong solution. |
abdulrahman305 bot
pushed a commit
to abdulrahman305/airflow
that referenced
this pull request
Oct 19, 2025
Simplify version-specific imports in the Google provider by using lazy_compat from common.compat provider added in apache#56790 for components that are available since Airflow 3.0.
kaxil
added a commit
to astronomer/airflow
that referenced
this pull request
Oct 20, 2025
Consolidate the Standard provider's compatibility logic by replacing imports from version_compat.py with direct imports from lazy_compat, providing a single source of truth for all Airflow 2.x ↔ 3.x compatibility. Follow-up of apache#56790 & apache#56793
kaxil
added a commit
to astronomer/airflow
that referenced
this pull request
Oct 20, 2025
Consolidate the Standard provider's compatibility logic by replacing imports from version_compat.py with direct imports from lazy_compat, providing a single source of truth for all Airflow 2.x ↔ 3.x compatibility. Follow-up of apache#56790 & apache#56793
nailo2c
pushed a commit
to nailo2c/airflow
that referenced
this pull request
Oct 20, 2025
Simplify version-specific imports in the Google provider by using lazy_compat from common.compat provider added in apache#56790 for components that are available since Airflow 3.0.
kaxil
added a commit
to astronomer/airflow
that referenced
this pull request
Oct 21, 2025
Consolidate the Standard provider's compatibility logic by replacing imports from version_compat.py with direct imports from lazy_compat, providing a single source of truth for all Airflow 2.x ↔ 3.x compatibility. Follow-up of apache#56790 & apache#56793
kaxil
added a commit
to astronomer/airflow
that referenced
this pull request
Oct 21, 2025
Consolidate the Standard provider's compatibility logic by replacing imports from version_compat.py with direct imports from lazy_compat, providing a single source of truth for all Airflow 2.x ↔ 3.x compatibility. Follow-up of apache#56790 & apache#56793
kaxil
added a commit
to astronomer/airflow
that referenced
this pull request
Oct 21, 2025
Consolidate the Standard provider's compatibility logic by replacing imports from version_compat.py with direct imports from lazy_compat, providing a single source of truth for all Airflow 2.x ↔ 3.x compatibility. Follow-up of apache#56790 & apache#56793
Jonpaco23
pushed a commit
to Jonpaco23/airflow
that referenced
this pull request
Oct 21, 2025
) Consolidate the Standard provider's compatibility logic by replacing imports from version_compat.py with direct imports from lazy_compat, providing a single source of truth for all Airflow 2.x ↔ 3.x compatibility. Follow-up of apache#56790 & apache#56793
amoghrajesh
reviewed
Oct 22, 2025
| from airflow.sdk.execution_time.xcom import XCom | ||
| else: | ||
| from airflow.models.xcom import XCom # type: ignore[no-redef] | ||
| from airflow.providers.common.compat.lazy_compat import BaseOperatorLink, BaseSensorOperator, XCom |
Contributor
There was a problem hiding this comment.
Can we not import BaseOperator here too?
Member
Author
There was a problem hiding this comment.
No, BaseOperator is special cased for 3.1 due to xcom_push bug -- there should be a comment about it in version_compat file
TyrellHaywood
pushed a commit
to TyrellHaywood/airflow
that referenced
this pull request
Oct 22, 2025
Simplify version-specific imports in the Google provider by using lazy_compat from common.compat provider added in apache#56790 for components that are available since Airflow 3.0.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
Simplify version-specific imports in the Google provider by using lazy_compat from common.compat provider added in #56790
for components that are available since Airflow 3.0.