You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ta...@apache.org on 2023/09/21 09:00:47 UTC
[airflow] branch main updated: Use `airflow.exceptions.AirflowException` in providers (#34511)
This is an automated email from the ASF dual-hosted git repository.
taragolis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 659d94f0ae Use `airflow.exceptions.AirflowException` in providers (#34511)
659d94f0ae is described below
commit 659d94f0ae89f47a7d4b95d6c19ab7f87bd3a60f
Author: Andrey Anshin <An...@taragol.is>
AuthorDate: Thu Sep 21 13:00:40 2023 +0400
Use `airflow.exceptions.AirflowException` in providers (#34511)
* Use airflow.exceptions.AirflowException in providers
* Use airflow.exceptions.AirflowException in providers system tests
* Use airflow.exceptions.AirflowException in providers tests
---
airflow/providers/amazon/aws/hooks/quicksight.py | 2 +-
airflow/providers/amazon/aws/operators/athena.py | 2 +-
airflow/providers/amazon/aws/operators/eventbridge.py | 2 +-
airflow/providers/amazon/aws/operators/glue.py | 2 +-
airflow/providers/amazon/aws/operators/glue_crawler.py | 2 +-
airflow/providers/amazon/aws/operators/lambda_function.py | 2 +-
airflow/providers/amazon/aws/triggers/ecs.py | 2 +-
airflow/providers/amazon/aws/triggers/sagemaker.py | 2 +-
airflow/providers/apache/beam/operators/beam.py | 2 +-
airflow/providers/apache/hdfs/hooks/hdfs.py | 2 +-
airflow/providers/apache/kafka/triggers/await_message.py | 2 +-
airflow/providers/arangodb/hooks/arangodb.py | 2 +-
airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py | 2 +-
airflow/providers/cncf/kubernetes/template_rendering.py | 2 +-
airflow/providers/common/sql/hooks/sql.py | 2 +-
airflow/providers/github/operators/github.py | 2 +-
airflow/providers/github/sensors/github.py | 2 +-
airflow/providers/google/ads/hooks/ads.py | 2 +-
airflow/providers/google/cloud/hooks/automl.py | 2 +-
airflow/providers/google/cloud/hooks/cloud_composer.py | 2 +-
airflow/providers/google/cloud/hooks/compute_ssh.py | 2 +-
airflow/providers/google/cloud/hooks/datacatalog.py | 2 +-
airflow/providers/google/cloud/hooks/dataform.py | 2 +-
.../providers/google/cloud/hooks/vertex_ai/batch_prediction_job.py | 2 +-
airflow/providers/google/cloud/hooks/vertex_ai/custom_job.py | 2 +-
airflow/providers/google/cloud/hooks/vertex_ai/dataset.py | 2 +-
airflow/providers/google/cloud/hooks/vertex_ai/endpoint_service.py | 2 +-
.../google/cloud/hooks/vertex_ai/hyperparameter_tuning_job.py | 2 +-
airflow/providers/google/cloud/hooks/vertex_ai/model_service.py | 2 +-
airflow/providers/google/cloud/operators/bigquery_dts.py | 2 +-
airflow/providers/google/cloud/operators/cloud_composer.py | 2 +-
airflow/providers/google/cloud/operators/dataflow.py | 3 +--
airflow/providers/google/cloud/operators/datafusion.py | 2 +-
airflow/providers/google/cloud/operators/datapipeline.py | 2 +-
airflow/providers/google/cloud/operators/dataplex.py | 2 +-
airflow/providers/google/cloud/operators/dataproc_metastore.py | 2 +-
airflow/providers/google/cloud/sensors/dataproc_metastore.py | 2 +-
airflow/providers/google/cloud/transfers/azure_fileshare_to_gcs.py | 3 +--
airflow/providers/google/cloud/transfers/bigquery_to_gcs.py | 2 +-
airflow/providers/google/cloud/transfers/gcs_to_bigquery.py | 2 +-
airflow/providers/google/cloud/triggers/cloud_composer.py | 2 +-
.../providers/google/cloud/triggers/cloud_storage_transfer_service.py | 2 +-
airflow/providers/google/cloud/triggers/dataproc.py | 2 +-
airflow/providers/presto/hooks/presto.py | 2 +-
airflow/providers/snowflake/hooks/snowflake.py | 2 +-
airflow/providers/snowflake/hooks/snowflake_sql_api.py | 2 +-
airflow/providers/snowflake/operators/snowflake.py | 3 +--
airflow/providers/trino/hooks/trino.py | 2 +-
tests/providers/alibaba/cloud/operators/test_analyticdb_spark.py | 2 +-
tests/providers/amazon/aws/hooks/test_base_aws.py | 2 +-
tests/providers/amazon/aws/hooks/test_glue.py | 2 +-
tests/providers/amazon/aws/hooks/test_redshift_sql.py | 2 +-
tests/providers/amazon/aws/operators/test_eventbridge.py | 2 +-
tests/providers/amazon/aws/operators/test_s3_object.py | 2 +-
tests/providers/amazon/aws/operators/test_sagemaker_base.py | 4 ++--
tests/providers/amazon/aws/sensors/test_glacier.py | 2 +-
tests/providers/amazon/aws/sensors/test_glue.py | 2 +-
tests/providers/amazon/aws/sensors/test_lambda_function.py | 2 +-
tests/providers/amazon/aws/triggers/test_ecs.py | 2 +-
tests/providers/amazon/aws/triggers/test_glue.py | 2 +-
tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py | 2 +-
tests/providers/cncf/kubernetes/hooks/test_kubernetes.py | 3 +--
tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py | 2 +-
tests/providers/databricks/operators/test_databricks_copy.py | 2 +-
tests/providers/databricks/operators/test_databricks_repos.py | 2 +-
tests/providers/google/cloud/hooks/test_compute_ssh.py | 2 +-
tests/providers/google/cloud/hooks/test_datacatalog.py | 2 +-
tests/providers/google/cloud/hooks/test_datafusion.py | 2 +-
tests/providers/google/cloud/hooks/test_mlengine.py | 2 +-
tests/providers/google/cloud/hooks/test_os_login.py | 2 +-
tests/providers/google/cloud/sensors/test_dataplex.py | 2 +-
tests/providers/google/cloud/sensors/test_dataproc.py | 2 +-
tests/providers/google/cloud/sensors/test_dataproc_metastore.py | 2 +-
tests/providers/google/cloud/transfers/test_gcs_to_local.py | 2 +-
tests/providers/google/cloud/transfers/test_s3_to_gcs.py | 3 +--
.../google/cloud/triggers/test_cloud_storage_transfer_service.py | 2 +-
tests/providers/microsoft/azure/transfers/test_sftp_to_wasb.py | 2 +-
tests/providers/microsoft/mssql/operators/test_mssql.py | 2 +-
tests/providers/presto/hooks/test_presto.py | 2 +-
tests/providers/snowflake/hooks/test_snowflake_sql_api.py | 2 +-
tests/providers/trino/hooks/test_trino.py | 2 +-
tests/system/providers/github/example_github.py | 2 +-
82 files changed, 83 insertions(+), 88 deletions(-)
diff --git a/airflow/providers/amazon/aws/hooks/quicksight.py b/airflow/providers/amazon/aws/hooks/quicksight.py
index 586a73b97b..6ee7c5bfd4 100644
--- a/airflow/providers/amazon/aws/hooks/quicksight.py
+++ b/airflow/providers/amazon/aws/hooks/quicksight.py
@@ -22,7 +22,7 @@ from functools import cached_property
from botocore.exceptions import ClientError
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
from airflow.providers.amazon.aws.hooks.sts import StsHook
diff --git a/airflow/providers/amazon/aws/operators/athena.py b/airflow/providers/amazon/aws/operators/athena.py
index 6dd1432ea4..e0de3122b0 100644
--- a/airflow/providers/amazon/aws/operators/athena.py
+++ b/airflow/providers/amazon/aws/operators/athena.py
@@ -20,8 +20,8 @@ from __future__ import annotations
from functools import cached_property
from typing import TYPE_CHECKING, Any, Sequence
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.athena import AthenaHook
from airflow.providers.amazon.aws.triggers.athena import AthenaTrigger
diff --git a/airflow/providers/amazon/aws/operators/eventbridge.py b/airflow/providers/amazon/aws/operators/eventbridge.py
index 88cf8b46e4..932e2b7cac 100644
--- a/airflow/providers/amazon/aws/operators/eventbridge.py
+++ b/airflow/providers/amazon/aws/operators/eventbridge.py
@@ -19,7 +19,7 @@ from __future__ import annotations
from functools import cached_property
from typing import TYPE_CHECKING, Sequence
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.eventbridge import EventBridgeHook
from airflow.utils.helpers import prune_dict
diff --git a/airflow/providers/amazon/aws/operators/glue.py b/airflow/providers/amazon/aws/operators/glue.py
index 3f67a639c2..97bcaba66a 100644
--- a/airflow/providers/amazon/aws/operators/glue.py
+++ b/airflow/providers/amazon/aws/operators/glue.py
@@ -22,8 +22,8 @@ import urllib.parse
from functools import cached_property
from typing import TYPE_CHECKING, Sequence
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.glue import GlueJobHook
from airflow.providers.amazon.aws.hooks.s3 import S3Hook
diff --git a/airflow/providers/amazon/aws/operators/glue_crawler.py b/airflow/providers/amazon/aws/operators/glue_crawler.py
index 99a705b6ea..660d4948d6 100644
--- a/airflow/providers/amazon/aws/operators/glue_crawler.py
+++ b/airflow/providers/amazon/aws/operators/glue_crawler.py
@@ -20,8 +20,8 @@ from __future__ import annotations
from functools import cached_property
from typing import TYPE_CHECKING, Sequence
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.triggers.glue_crawler import GlueCrawlerCompleteTrigger
if TYPE_CHECKING:
diff --git a/airflow/providers/amazon/aws/operators/lambda_function.py b/airflow/providers/amazon/aws/operators/lambda_function.py
index 5d7e980bb5..26f9f38cbb 100644
--- a/airflow/providers/amazon/aws/operators/lambda_function.py
+++ b/airflow/providers/amazon/aws/operators/lambda_function.py
@@ -22,8 +22,8 @@ from datetime import timedelta
from functools import cached_property
from typing import TYPE_CHECKING, Any, Sequence
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.lambda_function import LambdaHook
from airflow.providers.amazon.aws.triggers.lambda_function import LambdaCreateFunctionCompleteTrigger
diff --git a/airflow/providers/amazon/aws/triggers/ecs.py b/airflow/providers/amazon/aws/triggers/ecs.py
index 8a24d6e63a..2d4b68b98f 100644
--- a/airflow/providers/amazon/aws/triggers/ecs.py
+++ b/airflow/providers/amazon/aws/triggers/ecs.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Any, AsyncIterator
from botocore.exceptions import ClientError, WaiterError
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.ecs import EcsHook
from airflow.providers.amazon.aws.hooks.logs import AwsLogsHook
from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger
diff --git a/airflow/providers/amazon/aws/triggers/sagemaker.py b/airflow/providers/amazon/aws/triggers/sagemaker.py
index ae24f78fc5..b6ae8e8842 100644
--- a/airflow/providers/amazon/aws/triggers/sagemaker.py
+++ b/airflow/providers/amazon/aws/triggers/sagemaker.py
@@ -25,7 +25,7 @@ from typing import Any, AsyncIterator
from botocore.exceptions import WaiterError
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.sagemaker import SageMakerHook
from airflow.providers.amazon.aws.utils.waiter_with_logging import async_wait
from airflow.triggers.base import BaseTrigger, TriggerEvent
diff --git a/airflow/providers/apache/beam/operators/beam.py b/airflow/providers/apache/beam/operators/beam.py
index 583dbe12a7..943fc5b697 100644
--- a/airflow/providers/apache/beam/operators/beam.py
+++ b/airflow/providers/apache/beam/operators/beam.py
@@ -30,8 +30,8 @@ from contextlib import ExitStack
from functools import partial
from typing import IO, TYPE_CHECKING, Any, Callable, Sequence
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.apache.beam.hooks.beam import BeamHook, BeamRunnerType
from airflow.providers.apache.beam.triggers.beam import BeamPipelineTrigger
diff --git a/airflow/providers/apache/hdfs/hooks/hdfs.py b/airflow/providers/apache/hdfs/hooks/hdfs.py
index e7fdf77ce4..aa256dde3b 100644
--- a/airflow/providers/apache/hdfs/hooks/hdfs.py
+++ b/airflow/providers/apache/hdfs/hooks/hdfs.py
@@ -16,7 +16,7 @@
# under the License.
from __future__ import annotations
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook
_EXCEPTION_MESSAGE = """The old HDFS Hooks have been removed in 4.0.0 version of the apache.hdfs provider.
diff --git a/airflow/providers/apache/kafka/triggers/await_message.py b/airflow/providers/apache/kafka/triggers/await_message.py
index 8f89d2ba1f..8ec40b7404 100644
--- a/airflow/providers/apache/kafka/triggers/await_message.py
+++ b/airflow/providers/apache/kafka/triggers/await_message.py
@@ -22,7 +22,7 @@ from typing import Any, Sequence
from asgiref.sync import sync_to_async
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.apache.kafka.hooks.consume import KafkaConsumerHook
from airflow.triggers.base import BaseTrigger, TriggerEvent
from airflow.utils.module_loading import import_string
diff --git a/airflow/providers/arangodb/hooks/arangodb.py b/airflow/providers/arangodb/hooks/arangodb.py
index f8f4d90072..389694051d 100644
--- a/airflow/providers/arangodb/hooks/arangodb.py
+++ b/airflow/providers/arangodb/hooks/arangodb.py
@@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Any
from arango import AQLQueryExecuteError, ArangoClient as ArangoDBClient
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook
if TYPE_CHECKING:
diff --git a/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py b/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py
index 078c9e97e1..82288ef631 100644
--- a/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py
+++ b/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py
@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING, Sequence
from kubernetes.client import ApiException
from kubernetes.watch import Watch
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.cncf.kubernetes.hooks.kubernetes import KubernetesHook, _load_body_to_dict
diff --git a/airflow/providers/cncf/kubernetes/template_rendering.py b/airflow/providers/cncf/kubernetes/template_rendering.py
index 558229de84..c259a7258f 100644
--- a/airflow/providers/cncf/kubernetes/template_rendering.py
+++ b/airflow/providers/cncf/kubernetes/template_rendering.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING
from jinja2 import TemplateAssertionError, UndefinedError
from kubernetes.client.api_client import ApiClient
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.cncf.kubernetes.kube_config import KubeConfig
from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import (
create_pod_id,
diff --git a/airflow/providers/common/sql/hooks/sql.py b/airflow/providers/common/sql/hooks/sql.py
index ade3c6a95d..c390704192 100644
--- a/airflow/providers/common/sql/hooks/sql.py
+++ b/airflow/providers/common/sql/hooks/sql.py
@@ -36,7 +36,7 @@ import sqlparse
from packaging.version import Version
from sqlalchemy import create_engine
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook
from airflow.version import version
diff --git a/airflow/providers/github/operators/github.py b/airflow/providers/github/operators/github.py
index e7e305808f..28adae9582 100644
--- a/airflow/providers/github/operators/github.py
+++ b/airflow/providers/github/operators/github.py
@@ -21,7 +21,7 @@ from typing import TYPE_CHECKING, Any, Callable
from github import GithubException
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.github.hooks.github import GithubHook
diff --git a/airflow/providers/github/sensors/github.py b/airflow/providers/github/sensors/github.py
index db943cd0ea..868af7361c 100644
--- a/airflow/providers/github/sensors/github.py
+++ b/airflow/providers/github/sensors/github.py
@@ -21,7 +21,7 @@ from typing import TYPE_CHECKING, Any, Callable
from github import GithubException
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.github.hooks.github import GithubHook
from airflow.sensors.base import BaseSensorOperator
diff --git a/airflow/providers/google/ads/hooks/ads.py b/airflow/providers/google/ads/hooks/ads.py
index a3ef9b93f7..c32fecb5b9 100644
--- a/airflow/providers/google/ads/hooks/ads.py
+++ b/airflow/providers/google/ads/hooks/ads.py
@@ -26,7 +26,7 @@ from google.ads.googleads.client import GoogleAdsClient
from google.ads.googleads.errors import GoogleAdsException
from google.auth.exceptions import GoogleAuthError
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook
from airflow.providers.google.common.hooks.base_google import get_field
diff --git a/airflow/providers/google/cloud/hooks/automl.py b/airflow/providers/google/cloud/hooks/automl.py
index bda0d49cea..c774b962ef 100644
--- a/airflow/providers/google/cloud/hooks/automl.py
+++ b/airflow/providers/google/cloud/hooks/automl.py
@@ -41,7 +41,7 @@ from google.cloud.automl_v1beta1 import (
PredictResponse,
)
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID, GoogleBaseHook
diff --git a/airflow/providers/google/cloud/hooks/cloud_composer.py b/airflow/providers/google/cloud/hooks/cloud_composer.py
index d0543811c1..63170a4513 100644
--- a/airflow/providers/google/cloud/hooks/cloud_composer.py
+++ b/airflow/providers/google/cloud/hooks/cloud_composer.py
@@ -27,7 +27,7 @@ from google.cloud.orchestration.airflow.service_v1 import (
ImageVersionsClient,
)
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
diff --git a/airflow/providers/google/cloud/hooks/compute_ssh.py b/airflow/providers/google/cloud/hooks/compute_ssh.py
index 0619d79974..270c941288 100644
--- a/airflow/providers/google/cloud/hooks/compute_ssh.py
+++ b/airflow/providers/google/cloud/hooks/compute_ssh.py
@@ -26,7 +26,7 @@ from typing import Any
from googleapiclient.errors import HttpError
from paramiko.ssh_exception import SSHException
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.compute import ComputeEngineHook
from airflow.providers.google.cloud.hooks.os_login import OSLoginHook
from airflow.providers.ssh.hooks.ssh import SSHHook
diff --git a/airflow/providers/google/cloud/hooks/datacatalog.py b/airflow/providers/google/cloud/hooks/datacatalog.py
index 91f9d69d9b..fb009d52ab 100644
--- a/airflow/providers/google/cloud/hooks/datacatalog.py
+++ b/airflow/providers/google/cloud/hooks/datacatalog.py
@@ -31,7 +31,7 @@ from google.cloud.datacatalog import (
TagTemplateField,
)
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID, GoogleBaseHook
diff --git a/airflow/providers/google/cloud/hooks/dataform.py b/airflow/providers/google/cloud/hooks/dataform.py
index 5f26591e09..8d3c56d711 100644
--- a/airflow/providers/google/cloud/hooks/dataform.py
+++ b/airflow/providers/google/cloud/hooks/dataform.py
@@ -30,7 +30,7 @@ from google.cloud.dataform_v1beta1.types import (
WriteFileResponse,
)
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
if TYPE_CHECKING:
diff --git a/airflow/providers/google/cloud/hooks/vertex_ai/batch_prediction_job.py b/airflow/providers/google/cloud/hooks/vertex_ai/batch_prediction_job.py
index 3155245166..37f623aa00 100644
--- a/airflow/providers/google/cloud/hooks/vertex_ai/batch_prediction_job.py
+++ b/airflow/providers/google/cloud/hooks/vertex_ai/batch_prediction_job.py
@@ -33,7 +33,7 @@ from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform import BatchPredictionJob, Model, explain
from google.cloud.aiplatform_v1 import JobServiceClient
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
if TYPE_CHECKING:
diff --git a/airflow/providers/google/cloud/hooks/vertex_ai/custom_job.py b/airflow/providers/google/cloud/hooks/vertex_ai/custom_job.py
index 8e3ccf2286..6acee36701 100644
--- a/airflow/providers/google/cloud/hooks/vertex_ai/custom_job.py
+++ b/airflow/providers/google/cloud/hooks/vertex_ai/custom_job.py
@@ -31,7 +31,7 @@ from google.cloud.aiplatform import (
)
from google.cloud.aiplatform_v1 import JobServiceClient, PipelineServiceClient
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
diff --git a/airflow/providers/google/cloud/hooks/vertex_ai/dataset.py b/airflow/providers/google/cloud/hooks/vertex_ai/dataset.py
index d195bdce5c..0b4a3f6765 100644
--- a/airflow/providers/google/cloud/hooks/vertex_ai/dataset.py
+++ b/airflow/providers/google/cloud/hooks/vertex_ai/dataset.py
@@ -24,7 +24,7 @@ from google.api_core.client_options import ClientOptions
from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform_v1 import DatasetServiceClient
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
diff --git a/airflow/providers/google/cloud/hooks/vertex_ai/endpoint_service.py b/airflow/providers/google/cloud/hooks/vertex_ai/endpoint_service.py
index 31204490b3..c9a12d6077 100644
--- a/airflow/providers/google/cloud/hooks/vertex_ai/endpoint_service.py
+++ b/airflow/providers/google/cloud/hooks/vertex_ai/endpoint_service.py
@@ -34,7 +34,7 @@ from google.api_core.client_options import ClientOptions
from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform_v1 import EndpointServiceClient
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
if TYPE_CHECKING:
diff --git a/airflow/providers/google/cloud/hooks/vertex_ai/hyperparameter_tuning_job.py b/airflow/providers/google/cloud/hooks/vertex_ai/hyperparameter_tuning_job.py
index 6ca741c7b2..1592ab4551 100644
--- a/airflow/providers/google/cloud/hooks/vertex_ai/hyperparameter_tuning_job.py
+++ b/airflow/providers/google/cloud/hooks/vertex_ai/hyperparameter_tuning_job.py
@@ -34,7 +34,7 @@ from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform import CustomJob, HyperparameterTuningJob, gapic, hyperparameter_tuning
from google.cloud.aiplatform_v1 import JobServiceClient, types
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
if TYPE_CHECKING:
diff --git a/airflow/providers/google/cloud/hooks/vertex_ai/model_service.py b/airflow/providers/google/cloud/hooks/vertex_ai/model_service.py
index f12960eef4..4565a9e552 100644
--- a/airflow/providers/google/cloud/hooks/vertex_ai/model_service.py
+++ b/airflow/providers/google/cloud/hooks/vertex_ai/model_service.py
@@ -30,7 +30,7 @@ from google.api_core.client_options import ClientOptions
from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform_v1 import ModelServiceClient
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
if TYPE_CHECKING:
diff --git a/airflow/providers/google/cloud/operators/bigquery_dts.py b/airflow/providers/google/cloud/operators/bigquery_dts.py
index 5e8ea587b1..807b0a6aad 100644
--- a/airflow/providers/google/cloud/operators/bigquery_dts.py
+++ b/airflow/providers/google/cloud/operators/bigquery_dts.py
@@ -30,8 +30,8 @@ from google.cloud.bigquery_datatransfer_v1 import (
TransferState,
)
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.bigquery_dts import BiqQueryDataTransferServiceHook, get_object_id
from airflow.providers.google.cloud.links.bigquery_dts import BigQueryDataTransferConfigLink
from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
diff --git a/airflow/providers/google/cloud/operators/cloud_composer.py b/airflow/providers/google/cloud/operators/cloud_composer.py
index 3aaf58ef04..b28b0fd476 100644
--- a/airflow/providers/google/cloud/operators/cloud_composer.py
+++ b/airflow/providers/google/cloud/operators/cloud_composer.py
@@ -24,8 +24,8 @@ from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.orchestration.airflow.service_v1 import ImageVersion
from google.cloud.orchestration.airflow.service_v1.types import Environment
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.cloud_composer import CloudComposerHook
from airflow.providers.google.cloud.links.base import BaseGoogleLink
from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
diff --git a/airflow/providers/google/cloud/operators/dataflow.py b/airflow/providers/google/cloud/operators/dataflow.py
index bda2c1721f..05204e565e 100644
--- a/airflow/providers/google/cloud/operators/dataflow.py
+++ b/airflow/providers/google/cloud/operators/dataflow.py
@@ -27,9 +27,8 @@ from enum import Enum
from functools import cached_property
from typing import TYPE_CHECKING, Any, Sequence
-from airflow import AirflowException
from airflow.configuration import conf
-from airflow.exceptions import AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.providers.apache.beam.hooks.beam import BeamHook, BeamRunnerType
from airflow.providers.google.cloud.hooks.dataflow import (
DEFAULT_DATAFLOW_LOCATION,
diff --git a/airflow/providers/google/cloud/operators/datafusion.py b/airflow/providers/google/cloud/operators/datafusion.py
index d63de8442d..e5d0dec5df 100644
--- a/airflow/providers/google/cloud/operators/datafusion.py
+++ b/airflow/providers/google/cloud/operators/datafusion.py
@@ -23,8 +23,8 @@ from typing import TYPE_CHECKING, Any, Sequence
from google.api_core.retry import exponential_sleep_generator
from googleapiclient.errors import HttpError
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.datafusion import SUCCESS_STATES, DataFusionHook, PipelineStates
from airflow.providers.google.cloud.links.datafusion import (
DataFusionInstanceLink,
diff --git a/airflow/providers/google/cloud/operators/datapipeline.py b/airflow/providers/google/cloud/operators/datapipeline.py
index 2283b56ca4..a6e371dc8e 100644
--- a/airflow/providers/google/cloud/operators/datapipeline.py
+++ b/airflow/providers/google/cloud/operators/datapipeline.py
@@ -20,7 +20,7 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Sequence
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.datapipeline import DEFAULT_DATAPIPELINE_LOCATION, DataPipelineHook
from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
diff --git a/airflow/providers/google/cloud/operators/dataplex.py b/airflow/providers/google/cloud/operators/dataplex.py
index 9787212ab2..b4392b56f0 100644
--- a/airflow/providers/google/cloud/operators/dataplex.py
+++ b/airflow/providers/google/cloud/operators/dataplex.py
@@ -21,7 +21,7 @@ from __future__ import annotations
from time import sleep
from typing import TYPE_CHECKING, Any, Sequence
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.triggers.dataplex import DataplexDataQualityJobTrigger
if TYPE_CHECKING:
diff --git a/airflow/providers/google/cloud/operators/dataproc_metastore.py b/airflow/providers/google/cloud/operators/dataproc_metastore.py
index ff802b6801..c27c5dc314 100644
--- a/airflow/providers/google/cloud/operators/dataproc_metastore.py
+++ b/airflow/providers/google/cloud/operators/dataproc_metastore.py
@@ -28,7 +28,7 @@ from google.cloud.metastore_v1.types import Backup, MetadataImport, Service
from google.cloud.metastore_v1.types.metastore import DatabaseDumpSpec, Restore
from googleapiclient.errors import HttpError
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator, BaseOperatorLink
from airflow.models.xcom import XCom
from airflow.providers.google.cloud.hooks.dataproc_metastore import DataprocMetastoreHook
diff --git a/airflow/providers/google/cloud/sensors/dataproc_metastore.py b/airflow/providers/google/cloud/sensors/dataproc_metastore.py
index 4929cd95a7..c50c8f1a8b 100644
--- a/airflow/providers/google/cloud/sensors/dataproc_metastore.py
+++ b/airflow/providers/google/cloud/sensors/dataproc_metastore.py
@@ -19,7 +19,7 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Sequence
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.dataproc_metastore import DataprocMetastoreHook
from airflow.providers.google.cloud.hooks.gcs import parse_json_from_gcs
from airflow.sensors.base import BaseSensorOperator
diff --git a/airflow/providers/google/cloud/transfers/azure_fileshare_to_gcs.py b/airflow/providers/google/cloud/transfers/azure_fileshare_to_gcs.py
index a4ce95d289..9ba6129791 100644
--- a/airflow/providers/google/cloud/transfers/azure_fileshare_to_gcs.py
+++ b/airflow/providers/google/cloud/transfers/azure_fileshare_to_gcs.py
@@ -21,8 +21,7 @@ import warnings
from tempfile import NamedTemporaryFile
from typing import TYPE_CHECKING, Sequence
-from airflow import AirflowException
-from airflow.exceptions import AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.models import BaseOperator
from airflow.providers.google.cloud.hooks.gcs import GCSHook, _parse_gcs_url, gcs_object_is_directory
from airflow.providers.microsoft.azure.hooks.fileshare import AzureFileShareHook
diff --git a/airflow/providers/google/cloud/transfers/bigquery_to_gcs.py b/airflow/providers/google/cloud/transfers/bigquery_to_gcs.py
index 2fd968bf74..a01c564cc3 100644
--- a/airflow/providers/google/cloud/transfers/bigquery_to_gcs.py
+++ b/airflow/providers/google/cloud/transfers/bigquery_to_gcs.py
@@ -23,8 +23,8 @@ from typing import TYPE_CHECKING, Any, Sequence
from google.api_core.exceptions import Conflict
from google.cloud.bigquery import DEFAULT_RETRY, UnknownJob
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.google.cloud.hooks.bigquery import BigQueryHook, BigQueryJob
from airflow.providers.google.cloud.links.bigquery import BigQueryTableLink
diff --git a/airflow/providers/google/cloud/transfers/gcs_to_bigquery.py b/airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
index f3ece4fb07..94c233d6c5 100644
--- a/airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
+++ b/airflow/providers/google/cloud/transfers/gcs_to_bigquery.py
@@ -34,8 +34,8 @@ from google.cloud.bigquery import (
)
from google.cloud.bigquery.table import EncryptionConfiguration, Table, TableReference
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.google.cloud.hooks.bigquery import BigQueryHook, BigQueryJob
from airflow.providers.google.cloud.hooks.gcs import GCSHook
diff --git a/airflow/providers/google/cloud/triggers/cloud_composer.py b/airflow/providers/google/cloud/triggers/cloud_composer.py
index 254a87637c..4e52783a37 100644
--- a/airflow/providers/google/cloud/triggers/cloud_composer.py
+++ b/airflow/providers/google/cloud/triggers/cloud_composer.py
@@ -21,7 +21,7 @@ from __future__ import annotations
import asyncio
from typing import Any, Sequence
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.cloud_composer import CloudComposerAsyncHook
from airflow.triggers.base import BaseTrigger, TriggerEvent
diff --git a/airflow/providers/google/cloud/triggers/cloud_storage_transfer_service.py b/airflow/providers/google/cloud/triggers/cloud_storage_transfer_service.py
index c27e6ba507..aff5c71041 100644
--- a/airflow/providers/google/cloud/triggers/cloud_storage_transfer_service.py
+++ b/airflow/providers/google/cloud/triggers/cloud_storage_transfer_service.py
@@ -23,7 +23,7 @@ from typing import Any, AsyncIterator
from google.api_core.exceptions import GoogleAPIError
from google.cloud.storage_transfer_v1.types import TransferOperation
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.cloud_storage_transfer_service import (
CloudDataTransferServiceAsyncHook,
)
diff --git a/airflow/providers/google/cloud/triggers/dataproc.py b/airflow/providers/google/cloud/triggers/dataproc.py
index 9aec832d1a..7d7215ebc2 100644
--- a/airflow/providers/google/cloud/triggers/dataproc.py
+++ b/airflow/providers/google/cloud/triggers/dataproc.py
@@ -25,7 +25,7 @@ from typing import Any, AsyncIterator, Sequence
from google.api_core.exceptions import NotFound
from google.cloud.dataproc_v1 import Batch, ClusterStatus, JobStatus
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.dataproc import DataprocAsyncHook
from airflow.triggers.base import BaseTrigger, TriggerEvent
diff --git a/airflow/providers/presto/hooks/presto.py b/airflow/providers/presto/hooks/presto.py
index 26ef545be3..87dd0c68bc 100644
--- a/airflow/providers/presto/hooks/presto.py
+++ b/airflow/providers/presto/hooks/presto.py
@@ -25,8 +25,8 @@ import prestodb
from prestodb.exceptions import DatabaseError
from prestodb.transaction import IsolationLevel
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.providers.common.sql.hooks.sql import DbApiHook
from airflow.utils.operator_helpers import AIRFLOW_VAR_NAME_FORMAT_MAPPING, DEFAULT_FORMAT_PREFIX
diff --git a/airflow/providers/snowflake/hooks/snowflake.py b/airflow/providers/snowflake/hooks/snowflake.py
index e42a0b1b57..d08b51b8e0 100644
--- a/airflow/providers/snowflake/hooks/snowflake.py
+++ b/airflow/providers/snowflake/hooks/snowflake.py
@@ -32,7 +32,7 @@ from snowflake.connector import DictCursor, SnowflakeConnection, util_text
from snowflake.sqlalchemy import URL
from sqlalchemy import create_engine
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.common.sql.hooks.sql import DbApiHook, return_single_query_results
from airflow.utils.strings import to_boolean
diff --git a/airflow/providers/snowflake/hooks/snowflake_sql_api.py b/airflow/providers/snowflake/hooks/snowflake_sql_api.py
index 49cedf115a..f9e9c0eeea 100644
--- a/airflow/providers/snowflake/hooks/snowflake_sql_api.py
+++ b/airflow/providers/snowflake/hooks/snowflake_sql_api.py
@@ -26,7 +26,7 @@ import requests
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import serialization
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook
from airflow.providers.snowflake.utils.sql_api_generate_jwt import JWTGenerator
diff --git a/airflow/providers/snowflake/operators/snowflake.py b/airflow/providers/snowflake/operators/snowflake.py
index 864247dda1..8cde2c197a 100644
--- a/airflow/providers/snowflake/operators/snowflake.py
+++ b/airflow/providers/snowflake/operators/snowflake.py
@@ -22,9 +22,8 @@ import warnings
from datetime import timedelta
from typing import TYPE_CHECKING, Any, Iterable, List, Mapping, Sequence, SupportsAbs, cast
-from airflow import AirflowException
from airflow.configuration import conf
-from airflow.exceptions import AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.providers.common.sql.operators.sql import (
SQLCheckOperator,
SQLExecuteQueryOperator,
diff --git a/airflow/providers/trino/hooks/trino.py b/airflow/providers/trino/hooks/trino.py
index 22b433312d..aaa77a45bc 100644
--- a/airflow/providers/trino/hooks/trino.py
+++ b/airflow/providers/trino/hooks/trino.py
@@ -25,8 +25,8 @@ import trino
from trino.exceptions import DatabaseError
from trino.transaction import IsolationLevel
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.providers.common.sql.hooks.sql import DbApiHook
from airflow.utils.operator_helpers import AIRFLOW_VAR_NAME_FORMAT_MAPPING, DEFAULT_FORMAT_PREFIX
diff --git a/tests/providers/alibaba/cloud/operators/test_analyticdb_spark.py b/tests/providers/alibaba/cloud/operators/test_analyticdb_spark.py
index c6d960b3ef..68873b462e 100644
--- a/tests/providers/alibaba/cloud/operators/test_analyticdb_spark.py
+++ b/tests/providers/alibaba/cloud/operators/test_analyticdb_spark.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.alibaba.cloud.operators.analyticdb_spark import (
AnalyticDBSparkBaseOperator,
AnalyticDBSparkBatchOperator,
diff --git a/tests/providers/amazon/aws/hooks/test_base_aws.py b/tests/providers/amazon/aws/hooks/test_base_aws.py
index 084c282382..660190a6e9 100644
--- a/tests/providers/amazon/aws/hooks/test_base_aws.py
+++ b/tests/providers/amazon/aws/hooks/test_base_aws.py
@@ -38,7 +38,7 @@ from botocore.utils import FileWebIdentityTokenLoader
from moto import mock_dynamodb, mock_emr, mock_iam, mock_sts
from moto.core import DEFAULT_ACCOUNT_ID
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models.connection import Connection
from airflow.providers.amazon.aws.hooks.base_aws import (
AwsBaseHook,
diff --git a/tests/providers/amazon/aws/hooks/test_glue.py b/tests/providers/amazon/aws/hooks/test_glue.py
index d43ef2b8d9..799547dd57 100644
--- a/tests/providers/amazon/aws/hooks/test_glue.py
+++ b/tests/providers/amazon/aws/hooks/test_glue.py
@@ -26,7 +26,7 @@ import pytest
from botocore.exceptions import ClientError
from moto import mock_glue, mock_iam
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
from airflow.providers.amazon.aws.hooks.glue import GlueJobHook
diff --git a/tests/providers/amazon/aws/hooks/test_redshift_sql.py b/tests/providers/amazon/aws/hooks/test_redshift_sql.py
index e3c0ea80e8..5316372173 100644
--- a/tests/providers/amazon/aws/hooks/test_redshift_sql.py
+++ b/tests/providers/amazon/aws/hooks/test_redshift_sql.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import Connection
from airflow.providers.amazon.aws.hooks.redshift_sql import RedshiftSQLHook
from airflow.utils.types import NOTSET
diff --git a/tests/providers/amazon/aws/operators/test_eventbridge.py b/tests/providers/amazon/aws/operators/test_eventbridge.py
index 8d398b2261..56947e31d4 100644
--- a/tests/providers/amazon/aws/operators/test_eventbridge.py
+++ b/tests/providers/amazon/aws/operators/test_eventbridge.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.eventbridge import EventBridgeHook
from airflow.providers.amazon.aws.operators.eventbridge import (
EventBridgeDisableRuleOperator,
diff --git a/tests/providers/amazon/aws/operators/test_s3_object.py b/tests/providers/amazon/aws/operators/test_s3_object.py
index 251b80ae12..72e1bdc72a 100644
--- a/tests/providers/amazon/aws/operators/test_s3_object.py
+++ b/tests/providers/amazon/aws/operators/test_s3_object.py
@@ -24,7 +24,7 @@ import boto3
import pytest
from moto import mock_s3
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.s3 import S3Hook
from airflow.providers.amazon.aws.operators.s3 import (
S3CopyObjectOperator,
diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_base.py b/tests/providers/amazon/aws/operators/test_sagemaker_base.py
index 7e5bb06ffe..ddac1231b0 100644
--- a/tests/providers/amazon/aws/operators/test_sagemaker_base.py
+++ b/tests/providers/amazon/aws/operators/test_sagemaker_base.py
@@ -24,8 +24,8 @@ from unittest.mock import MagicMock, patch
import pytest
from botocore.exceptions import ClientError
-from airflow import DAG, AirflowException
-from airflow.models import DagRun, TaskInstance
+from airflow.exceptions import AirflowException
+from airflow.models import DAG, DagRun, TaskInstance
from airflow.providers.amazon.aws.operators.sagemaker import (
SageMakerBaseOperator,
SageMakerCreateExperimentOperator,
diff --git a/tests/providers/amazon/aws/sensors/test_glacier.py b/tests/providers/amazon/aws/sensors/test_glacier.py
index 20c4156e1b..126d7544fb 100644
--- a/tests/providers/amazon/aws/sensors/test_glacier.py
+++ b/tests/providers/amazon/aws/sensors/test_glacier.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.sensors.glacier import GlacierJobOperationSensor, JobStatus
SUCCEEDED = "Succeeded"
diff --git a/tests/providers/amazon/aws/sensors/test_glue.py b/tests/providers/amazon/aws/sensors/test_glue.py
index bbb77e6826..18bec48c4b 100644
--- a/tests/providers/amazon/aws/sensors/test_glue.py
+++ b/tests/providers/amazon/aws/sensors/test_glue.py
@@ -21,8 +21,8 @@ from unittest.mock import ANY
import pytest
-from airflow import AirflowException
from airflow.configuration import conf
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.glue import GlueJobHook
from airflow.providers.amazon.aws.sensors.glue import GlueJobSensor
diff --git a/tests/providers/amazon/aws/sensors/test_lambda_function.py b/tests/providers/amazon/aws/sensors/test_lambda_function.py
index 91d7e81b71..f97eb68b34 100644
--- a/tests/providers/amazon/aws/sensors/test_lambda_function.py
+++ b/tests/providers/amazon/aws/sensors/test_lambda_function.py
@@ -20,7 +20,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.lambda_function import LambdaHook
from airflow.providers.amazon.aws.sensors.lambda_function import LambdaFunctionStateSensor
diff --git a/tests/providers/amazon/aws/triggers/test_ecs.py b/tests/providers/amazon/aws/triggers/test_ecs.py
index 046a2634e2..8e46c65686 100644
--- a/tests/providers/amazon/aws/triggers/test_ecs.py
+++ b/tests/providers/amazon/aws/triggers/test_ecs.py
@@ -23,7 +23,7 @@ from unittest.mock import AsyncMock
import pytest
from botocore.exceptions import WaiterError
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.ecs import EcsHook
from airflow.providers.amazon.aws.hooks.logs import AwsLogsHook
from airflow.providers.amazon.aws.triggers.ecs import (
diff --git a/tests/providers/amazon/aws/triggers/test_glue.py b/tests/providers/amazon/aws/triggers/test_glue.py
index 428974c980..bb4f7189e3 100644
--- a/tests/providers/amazon/aws/triggers/test_glue.py
+++ b/tests/providers/amazon/aws/triggers/test_glue.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.glue import GlueJobHook
from airflow.providers.amazon.aws.hooks.glue_catalog import GlueCatalogHook
from airflow.providers.amazon.aws.triggers.glue import GlueCatalogPartitionTrigger, GlueJobCompleteTrigger
diff --git a/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py b/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py
index 5ba1d961cb..4e7e7a65c9 100644
--- a/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py
+++ b/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py
@@ -30,7 +30,7 @@ from kubernetes.client import models as k8s
from kubernetes.client.rest import ApiException
from urllib3 import HTTPResponse
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models.taskinstancekey import TaskInstanceKey
from airflow.operators.bash import BashOperator
from airflow.operators.empty import EmptyOperator
diff --git a/tests/providers/cncf/kubernetes/hooks/test_kubernetes.py b/tests/providers/cncf/kubernetes/hooks/test_kubernetes.py
index 7b5428481e..fb7de29655 100644
--- a/tests/providers/cncf/kubernetes/hooks/test_kubernetes.py
+++ b/tests/providers/cncf/kubernetes/hooks/test_kubernetes.py
@@ -29,8 +29,7 @@ import pytest
from kubernetes.config import ConfigException
from sqlalchemy.orm import make_transient
-from airflow import AirflowException
-from airflow.exceptions import AirflowNotFoundException
+from airflow.exceptions import AirflowException, AirflowNotFoundException
from airflow.hooks.base import BaseHook
from airflow.models import Connection
from airflow.providers.cncf.kubernetes.hooks.kubernetes import AsyncKubernetesHook, KubernetesHook
diff --git a/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py b/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py
index 242967928e..7e27940642 100644
--- a/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py
+++ b/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py
@@ -22,7 +22,7 @@ from unittest.mock import MagicMock, patch
import pytest
from dateutil import tz
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.cncf.kubernetes.operators.spark_kubernetes import SparkKubernetesOperator
diff --git a/tests/providers/databricks/operators/test_databricks_copy.py b/tests/providers/databricks/operators/test_databricks_copy.py
index 510e0a6c2f..a806ae73dd 100644
--- a/tests/providers/databricks/operators/test_databricks_copy.py
+++ b/tests/providers/databricks/operators/test_databricks_copy.py
@@ -19,7 +19,7 @@ from __future__ import annotations
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.databricks.operators.databricks_sql import DatabricksCopyIntoOperator
DATE = "2017-04-20"
diff --git a/tests/providers/databricks/operators/test_databricks_repos.py b/tests/providers/databricks/operators/test_databricks_repos.py
index 9e8770d3d9..a1b5ae3c51 100644
--- a/tests/providers/databricks/operators/test_databricks_repos.py
+++ b/tests/providers/databricks/operators/test_databricks_repos.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.databricks.operators.databricks_repos import (
DatabricksReposCreateOperator,
DatabricksReposDeleteOperator,
diff --git a/tests/providers/google/cloud/hooks/test_compute_ssh.py b/tests/providers/google/cloud/hooks/test_compute_ssh.py
index 721667263a..7c1b3a3178 100644
--- a/tests/providers/google/cloud/hooks/test_compute_ssh.py
+++ b/tests/providers/google/cloud/hooks/test_compute_ssh.py
@@ -25,7 +25,7 @@ import pytest
from googleapiclient.errors import HttpError
from paramiko.ssh_exception import SSHException
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import Connection
from airflow.providers.google.cloud.hooks.compute_ssh import ComputeEngineSSHHook
diff --git a/tests/providers/google/cloud/hooks/test_datacatalog.py b/tests/providers/google/cloud/hooks/test_datacatalog.py
index 4b109f8b9a..0d3a378c32 100644
--- a/tests/providers/google/cloud/hooks/test_datacatalog.py
+++ b/tests/providers/google/cloud/hooks/test_datacatalog.py
@@ -26,7 +26,7 @@ from google.api_core.retry import Retry
from google.cloud.datacatalog import CreateTagRequest, CreateTagTemplateRequest, Entry, Tag, TagTemplate
from google.protobuf.field_mask_pb2 import FieldMask
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.datacatalog import CloudDataCatalogHook
from tests.providers.google.cloud.utils.base_gcp_mock import (
mock_base_gcp_hook_default_project_id,
diff --git a/tests/providers/google/cloud/hooks/test_datafusion.py b/tests/providers/google/cloud/hooks/test_datafusion.py
index d6815da5b8..cfef7f4d1b 100644
--- a/tests/providers/google/cloud/hooks/test_datafusion.py
+++ b/tests/providers/google/cloud/hooks/test_datafusion.py
@@ -24,7 +24,7 @@ import pytest
from aiohttp.helpers import TimerNoop
from yarl import URL
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.datafusion import DataFusionAsyncHook, DataFusionHook
from airflow.providers.google.cloud.utils.datafusion import DataFusionPipelineType
from tests.providers.google.cloud.utils.base_gcp_mock import mock_base_gcp_hook_default_project_id
diff --git a/tests/providers/google/cloud/hooks/test_mlengine.py b/tests/providers/google/cloud/hooks/test_mlengine.py
index 9e2c012417..cf560cf179 100644
--- a/tests/providers/google/cloud/hooks/test_mlengine.py
+++ b/tests/providers/google/cloud/hooks/test_mlengine.py
@@ -28,7 +28,7 @@ from aiohttp.helpers import TimerNoop
from googleapiclient.errors import HttpError
from yarl import URL
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks import mlengine as hook
from airflow.providers.google.cloud.hooks.mlengine import MLEngineAsyncHook
from tests.providers.google.cloud.utils.base_gcp_mock import (
diff --git a/tests/providers/google/cloud/hooks/test_os_login.py b/tests/providers/google/cloud/hooks/test_os_login.py
index 49452d109d..568e96610c 100644
--- a/tests/providers/google/cloud/hooks/test_os_login.py
+++ b/tests/providers/google/cloud/hooks/test_os_login.py
@@ -22,7 +22,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.os_login import OSLoginHook
from tests.providers.google.cloud.utils.base_gcp_mock import (
mock_base_gcp_hook_default_project_id,
diff --git a/tests/providers/google/cloud/sensors/test_dataplex.py b/tests/providers/google/cloud/sensors/test_dataplex.py
index c9ae358efa..18f5b68b9d 100644
--- a/tests/providers/google/cloud/sensors/test_dataplex.py
+++ b/tests/providers/google/cloud/sensors/test_dataplex.py
@@ -22,7 +22,7 @@ import pytest
from google.api_core.gapic_v1.method import DEFAULT
from google.cloud.dataplex_v1.types import DataScanJob
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.dataplex import AirflowDataQualityScanResultTimeoutException
from airflow.providers.google.cloud.sensors.dataplex import (
DataplexDataQualityJobStatusSensor,
diff --git a/tests/providers/google/cloud/sensors/test_dataproc.py b/tests/providers/google/cloud/sensors/test_dataproc.py
index 61d6d55c91..9080705ebd 100644
--- a/tests/providers/google/cloud/sensors/test_dataproc.py
+++ b/tests/providers/google/cloud/sensors/test_dataproc.py
@@ -23,7 +23,7 @@ import pytest
from google.api_core.exceptions import ServerError
from google.cloud.dataproc_v1.types import Batch, JobStatus
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.sensors.dataproc import DataprocBatchSensor, DataprocJobSensor
from airflow.version import version as airflow_version
diff --git a/tests/providers/google/cloud/sensors/test_dataproc_metastore.py b/tests/providers/google/cloud/sensors/test_dataproc_metastore.py
index c18d325813..117210e2ba 100644
--- a/tests/providers/google/cloud/sensors/test_dataproc_metastore.py
+++ b/tests/providers/google/cloud/sensors/test_dataproc_metastore.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.sensors.dataproc_metastore import MetastoreHivePartitionSensor
DATAPROC_METASTORE_SENSOR_PATH = "airflow.providers.google.cloud.sensors.dataproc_metastore.{}"
diff --git a/tests/providers/google/cloud/transfers/test_gcs_to_local.py b/tests/providers/google/cloud/transfers/test_gcs_to_local.py
index 4c08645003..d88261699a 100644
--- a/tests/providers/google/cloud/transfers/test_gcs_to_local.py
+++ b/tests/providers/google/cloud/transfers/test_gcs_to_local.py
@@ -21,7 +21,7 @@ from unittest.mock import MagicMock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models.xcom import MAX_XCOM_SIZE
from airflow.providers.google.cloud.transfers.gcs_to_local import GCSToLocalFilesystemOperator
diff --git a/tests/providers/google/cloud/transfers/test_s3_to_gcs.py b/tests/providers/google/cloud/transfers/test_s3_to_gcs.py
index e763abf83f..48c29dc0e3 100644
--- a/tests/providers/google/cloud/transfers/test_s3_to_gcs.py
+++ b/tests/providers/google/cloud/transfers/test_s3_to_gcs.py
@@ -23,8 +23,7 @@ from unittest.mock import PropertyMock
import pytest
import time_machine
-from airflow import AirflowException
-from airflow.exceptions import TaskDeferred
+from airflow.exceptions import AirflowException, TaskDeferred
from airflow.providers.google.cloud.hooks.cloud_storage_transfer_service import CloudDataTransferServiceHook
from airflow.providers.google.cloud.transfers.s3_to_gcs import S3ToGCSOperator
from airflow.utils.timezone import utcnow
diff --git a/tests/providers/google/cloud/triggers/test_cloud_storage_transfer_service.py b/tests/providers/google/cloud/triggers/test_cloud_storage_transfer_service.py
index 19fc08a2b1..2072138954 100644
--- a/tests/providers/google/cloud/triggers/test_cloud_storage_transfer_service.py
+++ b/tests/providers/google/cloud/triggers/test_cloud_storage_transfer_service.py
@@ -22,7 +22,7 @@ import pytest
from google.api_core.exceptions import GoogleAPICallError
from google.cloud.storage_transfer_v1 import TransferOperation
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.cloud_storage_transfer_service import (
CloudDataTransferServiceAsyncHook,
)
diff --git a/tests/providers/microsoft/azure/transfers/test_sftp_to_wasb.py b/tests/providers/microsoft/azure/transfers/test_sftp_to_wasb.py
index 686eca5c68..a389abf846 100644
--- a/tests/providers/microsoft/azure/transfers/test_sftp_to_wasb.py
+++ b/tests/providers/microsoft/azure/transfers/test_sftp_to_wasb.py
@@ -21,7 +21,7 @@ from unittest import mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.providers.microsoft.azure.transfers.sftp_to_wasb import SftpFile, SFTPToWasbOperator
TASK_ID = "test-gcs-to-sftp-operator"
diff --git a/tests/providers/microsoft/mssql/operators/test_mssql.py b/tests/providers/microsoft/mssql/operators/test_mssql.py
index 62865c85f5..819faf42c8 100644
--- a/tests/providers/microsoft/mssql/operators/test_mssql.py
+++ b/tests/providers/microsoft/mssql/operators/test_mssql.py
@@ -22,7 +22,7 @@ from unittest.mock import MagicMock, Mock
import pytest
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
try:
from airflow.providers.microsoft.mssql.hooks.mssql import MsSqlHook
diff --git a/tests/providers/presto/hooks/test_presto.py b/tests/providers/presto/hooks/test_presto.py
index 423d4d2075..9f66687e4e 100644
--- a/tests/providers/presto/hooks/test_presto.py
+++ b/tests/providers/presto/hooks/test_presto.py
@@ -25,7 +25,7 @@ from unittest.mock import patch
import pytest
from prestodb.transaction import IsolationLevel
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import Connection
from airflow.providers.presto.hooks.presto import PrestoHook, generate_presto_client_info
diff --git a/tests/providers/snowflake/hooks/test_snowflake_sql_api.py b/tests/providers/snowflake/hooks/test_snowflake_sql_api.py
index 926a8248fb..a1e2f75063 100644
--- a/tests/providers/snowflake/hooks/test_snowflake_sql_api.py
+++ b/tests/providers/snowflake/hooks/test_snowflake_sql_api.py
@@ -28,7 +28,7 @@ from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.primitives.asymmetric import rsa
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import Connection
from airflow.providers.snowflake.hooks.snowflake_sql_api import (
SnowflakeSqlApiHook,
diff --git a/tests/providers/trino/hooks/test_trino.py b/tests/providers/trino/hooks/test_trino.py
index 5a9e51bf09..8aeb4cbe08 100644
--- a/tests/providers/trino/hooks/test_trino.py
+++ b/tests/providers/trino/hooks/test_trino.py
@@ -27,7 +27,7 @@ from unittest.mock import patch
import pytest
from trino.transaction import IsolationLevel
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models import Connection
from airflow.providers.trino.hooks.trino import TrinoHook
diff --git a/tests/system/providers/github/example_github.py b/tests/system/providers/github/example_github.py
index 658fcc470f..9fd4b3f939 100644
--- a/tests/system/providers/github/example_github.py
+++ b/tests/system/providers/github/example_github.py
@@ -23,7 +23,7 @@ from typing import Any
from github import GithubException
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
from airflow.models.dag import DAG
from airflow.providers.github.operators.github import GithubOperator
from airflow.providers.github.sensors.github import GithubSensor, GithubTagSensor