apache-airflow-providers-google 14.0.0__py3-none-any.whl → 14.1.0rc1__py3-none-any.whl

airflow/providers/google/cloud/links/base.py

@@ -19,12 +19,18 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, ClassVar
 
-from airflow.models import BaseOperatorLink, XCom
+from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
 
 if TYPE_CHECKING:
     from airflow.models import BaseOperator
     from airflow.models.taskinstancekey import TaskInstanceKey
 
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.sdk import BaseOperatorLink
+    from airflow.sdk.execution_time.xcom import XCom
+else:
+    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
+    from airflow.models.xcom import XCom  # type: ignore[no-redef]
 
 BASE_LINK = "https://console.cloud.google.com"
 

airflow/providers/google/cloud/links/datafusion.py

@@ -21,14 +21,20 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, ClassVar
 
-from airflow.models import BaseOperatorLink, XCom
+from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
+
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.sdk import BaseOperatorLink
+    from airflow.sdk.execution_time.xcom import XCom
+else:
+    from airflow.models import XCom  # type: ignore[no-redef]
+    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
 
 if TYPE_CHECKING:
     from airflow.models import BaseOperator
     from airflow.models.taskinstancekey import TaskInstanceKey
     from airflow.utils.context import Context
 
-
 BASE_LINK = "https://console.cloud.google.com/data-fusion"
 DATAFUSION_INSTANCE_LINK = BASE_LINK + "/locations/{region}/instances/{instance_name}?project={project_id}"
 DATAFUSION_PIPELINES_LINK = "{uri}/cdap/ns/{namespace}/pipelines"

airflow/providers/google/cloud/links/dataproc.py

@@ -25,14 +25,21 @@ from typing import TYPE_CHECKING, Any
 import attr
 
 from airflow.exceptions import AirflowProviderDeprecationWarning
-from airflow.models import BaseOperatorLink, XCom
 from airflow.providers.google.cloud.links.base import BASE_LINK, BaseGoogleLink
+from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
 
 if TYPE_CHECKING:
     from airflow.models import BaseOperator
     from airflow.models.taskinstancekey import TaskInstanceKey
     from airflow.utils.context import Context
 
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.sdk import BaseOperatorLink
+    from airflow.sdk.execution_time.xcom import XCom
+else:
+    from airflow.models import XCom  # type: ignore[no-redef]
+    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
+
 
 def __getattr__(name: str) -> Any:
     # PEP-562: deprecate module-level variable

airflow/providers/google/cloud/links/kubernetes_engine.py

@@ -19,9 +19,10 @@ from __future__ import annotations
 import json
 from typing import TYPE_CHECKING
 
-from airflow.providers.google.cloud.links.base import BaseGoogleLink
 from google.cloud.container_v1.types import Cluster
 
+from airflow.providers.google.cloud.links.base import BaseGoogleLink
+
 if TYPE_CHECKING:
     from airflow.utils.context import Context
 

airflow/providers/google/cloud/links/managed_kafka.py

@@ -31,6 +31,10 @@ MANAGED_KAFKA_CLUSTER_LIST_LINK = MANAGED_KAFKA_BASE_LINK + "/clusters?project={
 MANAGED_KAFKA_TOPIC_LINK = (
     MANAGED_KAFKA_BASE_LINK + "/{location}/clusters/{cluster_id}/topics/{topic_id}?project={project_id}"
 )
+MANAGED_KAFKA_CONSUMER_GROUP_LINK = (
+    MANAGED_KAFKA_BASE_LINK
+    + "/{location}/clusters/{cluster_id}/consumer_groups/{consumer_group_id}?project={project_id}"
+)
 
 
 class ApacheKafkaClusterLink(BaseGoogleLink):
@@ -102,3 +106,29 @@ class ApacheKafkaTopicLink(BaseGoogleLink):
                 "project_id": task_instance.project_id,
             },
         )
+
+
+class ApacheKafkaConsumerGroupLink(BaseGoogleLink):
+    """Helper class for constructing Apache Kafka Consumer Group link."""
+
+    name = "Apache Kafka Consumer Group"
+    key = "consumer_group_conf"
+    format_str = MANAGED_KAFKA_CONSUMER_GROUP_LINK
+
+    @staticmethod
+    def persist(
+        context: Context,
+        task_instance,
+        cluster_id: str,
+        consumer_group_id: str,
+    ):
+        task_instance.xcom_push(
+            context=context,
+            key=ApacheKafkaConsumerGroupLink.key,
+            value={
+                "location": task_instance.location,
+                "cluster_id": cluster_id,
+                "consumer_group_id": consumer_group_id,
+                "project_id": task_instance.project_id,
+            },
+        )

airflow/providers/google/cloud/log/gcs_task_handler.py

@@ -25,18 +25,21 @@ from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+# not sure why but mypy complains on missing `storage` but it is clearly there and is importable
+from google.cloud import storage  # type: ignore[attr-defined]
+
 from airflow.configuration import conf
 from airflow.exceptions import AirflowNotFoundException
 from airflow.providers.google.cloud.hooks.gcs import GCSHook, _parse_gcs_url
-from airflow.providers.google.cloud.utils.credentials_provider import get_credentials_and_project_id
+from airflow.providers.google.cloud.utils.credentials_provider import (
+    get_credentials_and_project_id,
+)
 from airflow.providers.google.common.consts import CLIENT_INFO
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
+from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils.log.file_task_handler import FileTaskHandler
 from airflow.utils.log.logging_mixin import LoggingMixin
 
-# not sure why but mypy complains on missing `storage` but it is clearly there and is importable
-from google.cloud import storage  # type: ignore[attr-defined]
-
 if TYPE_CHECKING:
     from airflow.models.taskinstance import TaskInstance
 
@@ -188,9 +191,13 @@ class GCSTaskHandler(FileTaskHandler, LoggingMixin):
 
         if blobs:
             uris = [f"gs://{bucket}/{b.name}" for b in blobs]
-            messages.extend(["Found remote logs:", *[f"  * {x}" for x in sorted(uris)]])
+            if AIRFLOW_V_3_0_PLUS:
+                messages = uris
+            else:
+                messages.extend(["Found remote logs:", *[f"  * {x}" for x in sorted(uris)]])
         else:
-            messages.append(f"No logs found in GCS; ti=%s {ti}")
+            if not AIRFLOW_V_3_0_PLUS:
+                messages.append(f"No logs found in GCS; ti={ti}")
         try:
             for key in sorted(uris):
                 blob = storage.Blob.from_string(key, self.client)
@@ -198,7 +205,8 @@ class GCSTaskHandler(FileTaskHandler, LoggingMixin):
                 if remote_log:
                     logs.append(remote_log)
         except Exception as e:
-            messages.append(f"Unable to read remote log {e}")
+            if not AIRFLOW_V_3_0_PLUS:
+                messages.append(f"Unable to read remote log {e}")
         return messages, logs
 
     def gcs_write(self, log, remote_log_location) -> bool:

airflow/providers/google/cloud/log/stackdriver_task_handler.py

@@ -25,21 +25,23 @@ from functools import cached_property
 from typing import TYPE_CHECKING
 from urllib.parse import urlencode
 
-from airflow.exceptions import AirflowProviderDeprecationWarning
-from airflow.providers.google.cloud.utils.credentials_provider import get_credentials_and_project_id
-from airflow.providers.google.common.consts import CLIENT_INFO
-from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
-from airflow.utils.types import NOTSET, ArgNotSet
 from google.cloud import logging as gcp_logging
 from google.cloud.logging import Resource
 from google.cloud.logging.handlers.transports import BackgroundThreadTransport, Transport
 from google.cloud.logging_v2.services.logging_service_v2 import LoggingServiceV2Client
 from google.cloud.logging_v2.types import ListLogEntriesRequest, ListLogEntriesResponse
 
+from airflow.exceptions import AirflowProviderDeprecationWarning
+from airflow.providers.google.cloud.utils.credentials_provider import get_credentials_and_project_id
+from airflow.providers.google.common.consts import CLIENT_INFO
+from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
+from airflow.utils.types import NOTSET, ArgNotSet
+
 if TYPE_CHECKING:
-    from airflow.models import TaskInstance
     from google.auth.credentials import Credentials
 
+    from airflow.models import TaskInstance
+
 
 if not AIRFLOW_V_3_0_PLUS:
     from airflow.utils.log.trigger_handler import ctx_indiv_trigger

airflow/providers/google/cloud/openlineage/utils.py

@@ -26,6 +26,8 @@ from collections import defaultdict
 from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
+from google.cloud.dataproc_v1 import Batch, RuntimeConfig
+
 from airflow.providers.common.compat.openlineage.facet import (
     ColumnLineageDatasetFacet,
     DatasetFacet,
@@ -42,12 +44,12 @@ from airflow.providers.common.compat.openlineage.utils.spark import (
     inject_transport_information_into_spark_properties,
 )
 from airflow.providers.google.cloud.hooks.gcs import _parse_gcs_url
-from google.cloud.dataproc_v1 import Batch, RuntimeConfig
 
 if TYPE_CHECKING:
+    from google.cloud.bigquery.table import Table
+
     from airflow.providers.common.compat.openlineage.facet import Dataset
     from airflow.utils.context import Context
-    from google.cloud.bigquery.table import Table
 
 
 log = logging.getLogger(__name__)

airflow/providers/google/cloud/operators/alloy_db.py

@@ -23,6 +23,10 @@ from collections.abc import Sequence
 from functools import cached_property
 from typing import TYPE_CHECKING
 
+from google.api_core.exceptions import NotFound
+from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
+from google.cloud import alloydb_v1
+
 from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.alloy_db import AlloyDbHook
 from airflow.providers.google.cloud.links.alloy_db import (
@@ -31,18 +35,15 @@ from airflow.providers.google.cloud.links.alloy_db import (
     AlloyDBUsersLink,
 )
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
-from google.api_core.exceptions import NotFound
-from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
-from google.cloud import alloydb_v1
 
 if TYPE_CHECKING:
     import proto
-
-    from airflow.utils.context import Context
     from google.api_core.operation import Operation
     from google.api_core.retry import Retry
     from google.protobuf.field_mask_pb2 import FieldMask
 
+    from airflow.utils.context import Context
+
 
 class AlloyDBBaseOperator(GoogleCloudBaseOperator):
     """

airflow/providers/google/cloud/operators/automl.py

@@ -24,6 +24,15 @@ from collections.abc import Sequence
 from functools import cached_property
 from typing import TYPE_CHECKING, cast
 
+from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
+from google.cloud.automl_v1beta1 import (
+    ColumnSpec,
+    Dataset,
+    Model,
+    PredictResponse,
+    TableSpec,
+)
+
 from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
 from airflow.providers.google.cloud.hooks.automl import CloudAutoMLHook
 from airflow.providers.google.cloud.hooks.vertex_ai.prediction_service import PredictionServiceHook
@@ -37,19 +46,12 @@ from airflow.providers.google.cloud.links.translate import (
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
 from airflow.providers.google.common.deprecated import deprecated
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
-from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
-from google.cloud.automl_v1beta1 import (
-    ColumnSpec,
-    Dataset,
-    Model,
-    PredictResponse,
-    TableSpec,
-)
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
 
+    from airflow.utils.context import Context
+
 MetaData = Sequence[tuple[str, str]]
 
 

airflow/providers/google/cloud/operators/bigquery.py

@@ -27,6 +27,11 @@ from collections.abc import Sequence
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, SupportsAbs
 
+from google.api_core.exceptions import Conflict
+from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
+from google.cloud.bigquery import DEFAULT_RETRY, CopyJob, ExtractJob, LoadJob, QueryJob, Row
+from google.cloud.bigquery.table import RowIterator, Table, TableListItem, TableReference
+
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning, AirflowSkipException
 from airflow.providers.common.sql.operators.sql import (  # type: ignore[attr-defined] # for _parse_boolean
@@ -57,16 +62,13 @@ from airflow.providers.google.cloud.utils.bigquery import convert_job_id
 from airflow.providers.google.common.deprecated import deprecated
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
 from airflow.utils.helpers import exactly_one
-from google.api_core.exceptions import Conflict
-from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
-from google.cloud.bigquery import DEFAULT_RETRY, CopyJob, ExtractJob, LoadJob, QueryJob, Row
-from google.cloud.bigquery.table import RowIterator, Table, TableListItem, TableReference
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
     from google.cloud.bigquery import UnknownJob
 
+    from airflow.utils.context import Context
+
 
 BIGQUERY_JOB_DETAILS_LINK_FMT = "https://console.cloud.google.com/bigquery?j={job_id}"
 
@@ -2895,7 +2897,7 @@ class BigQueryInsertJobOperator(GoogleCloudBaseOperator, _BigQueryInsertJobOpera
 
     def _add_job_labels(self) -> None:
         dag_label = self.dag_id.lower()
-        task_label = self.task_id.lower()
+        task_label = self.task_id.lower().replace(".", "-")
 
         if LABEL_REGEX.match(dag_label) and LABEL_REGEX.match(task_label):
             automatic_labels = {"airflow-dag": dag_label, "airflow-task": task_label}

airflow/providers/google/cloud/operators/bigquery_dts.py

@@ -24,13 +24,6 @@ from collections.abc import Sequence
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-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
-from airflow.providers.google.cloud.triggers.bigquery_dts import BigQueryDataTransferRunTrigger
-from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
 from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
 from google.cloud.bigquery_datatransfer_v1 import (
     StartManualTransferRunsResponse,
@@ -39,10 +32,19 @@ from google.cloud.bigquery_datatransfer_v1 import (
     TransferState,
 )
 
+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
+from airflow.providers.google.cloud.triggers.bigquery_dts import BigQueryDataTransferRunTrigger
+from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
+
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
 
+    from airflow.utils.context import Context
+
 
 def _get_transfer_config_details(config_transfer_name: str):
     config_details = config_transfer_name.split("/")

airflow/providers/google/cloud/operators/bigtable.py

@@ -23,6 +23,7 @@ from collections.abc import Iterable, Sequence
 from typing import TYPE_CHECKING
 
 import google.api_core.exceptions
+
 from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.bigtable import BigtableHook
 from airflow.providers.google.cloud.links.bigtable import (
@@ -36,10 +37,11 @@ from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
 if TYPE_CHECKING:
     import enum
 
-    from airflow.utils.context import Context
     from google.cloud.bigtable import enums
     from google.cloud.bigtable.column_family import GarbageCollectionRule
 
+    from airflow.utils.context import Context
+
 
 class BigtableValidationMixin:
     """Common class for Cloud Bigtable operators for validating required fields."""

airflow/providers/google/cloud/operators/cloud_base.py

@@ -19,9 +19,10 @@
 
 from __future__ import annotations
 
-from airflow.models import BaseOperator
 from google.api_core.gapic_v1.method import DEFAULT
 
+from airflow.models import BaseOperator
+
 
 class GoogleCloudBaseOperator(BaseOperator):
     """Abstract base class for operators using Google API client libraries."""

airflow/providers/google/cloud/operators/cloud_batch.py

@@ -20,17 +20,19 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
+from google.cloud.batch_v1 import Job, Task
+
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.cloud_batch import CloudBatchHook
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
 from airflow.providers.google.cloud.triggers.cloud_batch import CloudBatchJobFinishedTrigger
-from google.cloud.batch_v1 import Job, Task
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core import operation
 
+    from airflow.utils.context import Context
+
 
 class CloudBatchSubmitJobOperator(GoogleCloudBaseOperator):
     """

airflow/providers/google/cloud/operators/cloud_build.py

@@ -26,6 +26,9 @@ from copy import deepcopy
 from typing import TYPE_CHECKING, Any
 from urllib.parse import unquote, urlsplit
 
+from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
+from google.cloud.devtools.cloudbuild_v1.types import Build, BuildTrigger, RepoSource
+
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.cloud_build import CloudBuildHook
@@ -41,13 +44,12 @@ from airflow.providers.google.common.consts import GOOGLE_DEFAULT_DEFERRABLE_MET
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
 from airflow.utils import yaml
 from airflow.utils.helpers import exactly_one
-from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
-from google.cloud.devtools.cloudbuild_v1.types import Build, BuildTrigger, RepoSource
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
 
+    from airflow.utils.context import Context
+
 
 REGEX_REPO_PATH = re.compile(r"^/(?P<project_id>[^/]+)/(?P<repo_name>[^/]+)[\+/]*(?P<branch_name>[^:]+)?")
 

airflow/providers/google/cloud/operators/cloud_composer.py

@@ -21,6 +21,11 @@ import shlex
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
+from google.api_core.exceptions import AlreadyExists
+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, ExecuteAirflowCommandResponse
+
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.cloud_composer import CloudComposerHook
@@ -31,16 +36,13 @@ from airflow.providers.google.cloud.triggers.cloud_composer import (
     CloudComposerExecutionTrigger,
 )
 from airflow.providers.google.common.consts import GOOGLE_DEFAULT_DEFERRABLE_METHOD_NAME
-from google.api_core.exceptions import AlreadyExists
-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, ExecuteAirflowCommandResponse
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
     from google.protobuf.field_mask_pb2 import FieldMask
 
+    from airflow.utils.context import Context
+
 CLOUD_COMPOSER_BASE_LINK = "https://console.cloud.google.com/composer/environments"
 CLOUD_COMPOSER_DETAILS_LINK = (
     CLOUD_COMPOSER_BASE_LINK + "/detail/{region}/{environment_id}/monitoring?project={project_id}"

airflow/providers/google/cloud/operators/cloud_memorystore.py

@@ -29,6 +29,10 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
+from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
+from google.cloud.memcache_v1beta2.types import cloud_memcache
+from google.cloud.redis_v1 import FailoverInstanceRequest, InputConfig, Instance, OutputConfig
+
 from airflow.providers.google.cloud.hooks.cloud_memorystore import (
     CloudMemorystoreHook,
     CloudMemorystoreMemcachedHook,
@@ -41,15 +45,13 @@ from airflow.providers.google.cloud.links.cloud_memorystore import (
 )
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
-from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
-from google.cloud.memcache_v1beta2.types import cloud_memcache
-from google.cloud.redis_v1 import FailoverInstanceRequest, InputConfig, Instance, OutputConfig
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
     from google.protobuf.field_mask_pb2 import FieldMask
 
+    from airflow.utils.context import Context
+
 
 class CloudMemorystoreCreateInstanceOperator(GoogleCloudBaseOperator):
     """

airflow/providers/google/cloud/operators/cloud_run.py

@@ -21,19 +21,21 @@ from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any
 
 import google.cloud.exceptions
+from google.api_core.exceptions import AlreadyExists
+from google.cloud.run_v2 import Job, Service
+
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.cloud_run import CloudRunHook, CloudRunServiceHook
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
 from airflow.providers.google.cloud.triggers.cloud_run import CloudRunJobFinishedTrigger, RunJobStatus
-from google.api_core.exceptions import AlreadyExists
-from google.cloud.run_v2 import Job, Service
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core import operation
     from google.cloud.run_v2.types import Execution
 
+    from airflow.utils.context import Context
+
 
 class CloudRunCreateJobOperator(GoogleCloudBaseOperator):
     """

airflow/providers/google/cloud/operators/compute.py

@@ -23,9 +23,11 @@ from collections.abc import Sequence
 from copy import deepcopy
 from typing import TYPE_CHECKING, Any
 
-from json_merge_patch import merge
+from google.api_core import exceptions
+from google.cloud.compute_v1.types import Instance, InstanceGroupManager, InstanceTemplate
 
 from airflow.exceptions import AirflowException
+from airflow.providers.google._vendor.json_merge_patch import merge
 from airflow.providers.google.cloud.hooks.compute import ComputeEngineHook
 from airflow.providers.google.cloud.links.compute import (
     ComputeInstanceDetailsLink,
@@ -36,13 +38,12 @@ from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseO
 from airflow.providers.google.cloud.utils.field_sanitizer import GcpBodyFieldSanitizer
 from airflow.providers.google.cloud.utils.field_validator import GcpBodyFieldValidator
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
-from google.api_core import exceptions
-from google.cloud.compute_v1.types import Instance, InstanceGroupManager, InstanceTemplate
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
 
+    from airflow.utils.context import Context
+
 
 class ComputeEngineBaseOperator(GoogleCloudBaseOperator):
     """Abstract base operator for Google Compute Engine operators to inherit from."""

airflow/providers/google/cloud/operators/datacatalog.py

@@ -19,14 +19,6 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
-from airflow.providers.google.cloud.hooks.datacatalog import CloudDataCatalogHook
-from airflow.providers.google.cloud.links.datacatalog import (
-    DataCatalogEntryGroupLink,
-    DataCatalogEntryLink,
-    DataCatalogTagTemplateLink,
-)
-from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
-from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
 from google.api_core.exceptions import AlreadyExists, NotFound
 from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
 from google.cloud.datacatalog import (
@@ -40,11 +32,21 @@ from google.cloud.datacatalog import (
     TagTemplateField,
 )
 
+from airflow.providers.google.cloud.hooks.datacatalog import CloudDataCatalogHook
+from airflow.providers.google.cloud.links.datacatalog import (
+    DataCatalogEntryGroupLink,
+    DataCatalogEntryLink,
+    DataCatalogTagTemplateLink,
+)
+from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
+from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
+
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
     from google.protobuf.field_mask_pb2 import FieldMask
 
+    from airflow.utils.context import Context
+
 
 class CloudDataCatalogCreateEntryOperator(GoogleCloudBaseOperator):
     """

airflow/providers/google/cloud/operators/dataform.py

@@ -26,11 +26,10 @@ from airflow.providers.google.cloud.links.dataform import (
 )
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
     from google.api_core.retry import Retry
 
-from airflow.providers.google.cloud.hooks.dataform import DataformHook
-from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
+    from airflow.utils.context import Context
+
 from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
 from google.cloud.dataform_v1beta1.types import (
     CompilationResult,
@@ -43,6 +42,9 @@ from google.cloud.dataform_v1beta1.types import (
     WriteFileResponse,
 )
 
+from airflow.providers.google.cloud.hooks.dataform import DataformHook
+from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
+
 
 class DataformCreateCompilationResultOperator(GoogleCloudBaseOperator):
     """

airflow/providers/google/cloud/operators/datafusion.py

@@ -22,6 +22,7 @@ import time
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any
 
+from google.api_core.retry import exponential_sleep_generator
 from googleapiclient.errors import HttpError
 
 from airflow.configuration import conf
@@ -38,7 +39,6 @@ from airflow.providers.google.cloud.utils.datafusion import DataFusionPipelineTy
 from airflow.providers.google.cloud.utils.helpers import resource_path_to_dict
 from airflow.providers.google.common.deprecated import deprecated
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
-from google.api_core.retry import exponential_sleep_generator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context