Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
# [START import_module]
import pendulum

from airflow.providers.standard.operators.python import get_current_context
from airflow.sdk import dag, task
from airflow.sdk import dag, get_current_context, task

# [END import_module]

Expand Down
4 changes: 2 additions & 2 deletions airflow-core/tests/unit/models/test_mappedoperator.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def execute(self, context):


def _create_mapped_with_name_template_taskflow(*, task_id, map_names, template):
from airflow.providers.standard.operators.python import get_current_context
from airflow.sdk import get_current_context

@task(task_id=task_id, map_index_template=template)
def task1(map_name):
Expand All @@ -360,7 +360,7 @@ def execute(self, context):


def _create_named_map_index_renders_on_failure_taskflow(*, task_id, map_names, template):
from airflow.providers.standard.operators.python import get_current_context
from airflow.sdk import get_current_context

@task(task_id=task_id, map_index_template=template)
def task1(map_name):
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/tests/unit/models/test_taskinstance.py
Original file line number Diff line number Diff line change
Expand Up @@ -3713,7 +3713,7 @@ def f(*args, **kwargs):

def test_get_current_context_works_in_template(self, dag_maker):
def user_defined_macro():
from airflow.providers.standard.operators.python import get_current_context
from airflow.sdk import get_current_context

get_current_context()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
SageMakerTransformSensor,
SageMakerTuningSensor,
)
from airflow.providers.standard.operators.python import get_current_context
from airflow.utils.trigger_rule import TriggerRule

from system.amazon.aws.utils import ENV_ID_KEY, SystemTestContextBuilder, prune_logs
Expand Down Expand Up @@ -420,6 +419,13 @@ def set_up(env_id, role_arn):
_install_aws_cli_if_needed()
_build_and_upload_docker_image(preprocess_script, ecr_repository_uri)

from airflow.providers.amazon.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import get_current_context
else:
from airflow.providers.standard.operators.python import get_current_context

ti = get_current_context()["ti"]
ti.xcom_push(key="docker_image", value=ecr_repository_uri)
ti.xcom_push(key="bucket_name", value=bucket_name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from collections.abc import Collection, Mapping, Sequence
from typing import Any, Callable

from airflow.providers.common.compat.standard.operators import PythonOperator, get_current_context
from airflow.providers.common.compat.standard.operators import PythonOperator
from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook
from airflow.providers.snowflake.utils.snowpark import inject_session_into_op_kwargs

Expand Down Expand Up @@ -115,6 +115,14 @@ def execute_callable(self):
session_parameters=self.session_parameters,
)
session = hook.get_snowpark_session()

from airflow.providers.snowflake.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import get_current_context
else:
from airflow.providers.standard.operators.python import get_current_context

context = get_current_context()
session.update_query_tag(
{
Expand Down
Loading