apache-airflow-providers-google 10.14.0rc2__py3-none-any.whl → 10.15.0rc1__py3-none-any.whl

airflow/providers/google/cloud/triggers/pubsub.py

@@ -79,7 +79,7 @@ class PubsubPullTrigger(BaseTrigger):
         self.hook = PubSubAsyncHook()
 
     def serialize(self) -> tuple[str, dict[str, Any]]:
-        """Serializes PubsubPullTrigger arguments and classpath."""
+        """Serialize PubsubPullTrigger arguments and classpath."""
         return (
             "airflow.providers.google.cloud.triggers.pubsub.PubsubPullTrigger",
             {

airflow/providers/google/cloud/triggers/vertex_ai.py

@@ -0,0 +1,99 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from typing import Any, AsyncIterator, Sequence
+
+from google.cloud.aiplatform_v1 import HyperparameterTuningJob, JobState
+
+from airflow.exceptions import AirflowException
+from airflow.providers.google.cloud.hooks.vertex_ai.hyperparameter_tuning_job import (
+    HyperparameterTuningJobAsyncHook,
+)
+from airflow.triggers.base import BaseTrigger, TriggerEvent
+
+
+class CreateHyperparameterTuningJobTrigger(BaseTrigger):
+    """CreateHyperparameterTuningJobTrigger run on the trigger worker to perform create operation."""
+
+    statuses_success = {
+        JobState.JOB_STATE_PAUSED,
+        JobState.JOB_STATE_SUCCEEDED,
+    }
+
+    def __init__(
+        self,
+        conn_id: str,
+        project_id: str,
+        location: str,
+        job_id: str,
+        poll_interval: int,
+        impersonation_chain: str | Sequence[str] | None = None,
+    ):
+        super().__init__()
+        self.conn_id = conn_id
+        self.project_id = project_id
+        self.location = location
+        self.job_id = job_id
+        self.poll_interval = poll_interval
+        self.impersonation_chain = impersonation_chain
+
+    def serialize(self) -> tuple[str, dict[str, Any]]:
+        return (
+            "airflow.providers.google.cloud.triggers.vertex_ai.CreateHyperparameterTuningJobTrigger",
+            {
+                "conn_id": self.conn_id,
+                "project_id": self.project_id,
+                "location": self.location,
+                "job_id": self.job_id,
+                "poll_interval": self.poll_interval,
+                "impersonation_chain": self.impersonation_chain,
+            },
+        )
+
+    async def run(self) -> AsyncIterator[TriggerEvent]:
+        hook = self._get_async_hook()
+        try:
+            job = await hook.wait_hyperparameter_tuning_job(
+                project_id=self.project_id,
+                location=self.location,
+                job_id=self.job_id,
+                poll_interval=self.poll_interval,
+            )
+        except AirflowException as ex:
+            yield TriggerEvent(
+                {
+                    "status": "error",
+                    "message": str(ex),
+                }
+            )
+            return
+
+        status = "success" if job.state in self.statuses_success else "error"
+        message = f"Hyperparameter tuning job {job.name} completed with status {job.state.name}"
+        yield TriggerEvent(
+            {
+                "status": status,
+                "message": message,
+                "job": HyperparameterTuningJob.to_dict(job),
+            }
+        )
+
+    def _get_async_hook(self) -> HyperparameterTuningJobAsyncHook:
+        return HyperparameterTuningJobAsyncHook(
+            gcp_conn_id=self.conn_id, impersonation_chain=self.impersonation_chain
+        )

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

@@ -21,7 +21,7 @@ from typing import Any
 
 def bq_cast(string_field: str, bq_type: str) -> None | int | float | bool | str:
     """
-    Helper method that casts a BigQuery row to the appropriate data types.
+    Cast a BigQuery row to the appropriate data types.
 
     This is useful because BigQuery returns all fields as strings.
     """
@@ -41,7 +41,7 @@ def bq_cast(string_field: str, bq_type: str) -> None | int | float | bool | str:
 
 def convert_job_id(job_id: str | list[str], project_id: str, location: str | None) -> Any:
     """
-    Helper method that converts to path: project_id:location:job_id.
+    Convert job_id to path: project_id:location:job_id.
 
     :param project_id: Required. The ID of the Google Cloud project where workspace located.
     :param location: Optional. The ID of the Google Cloud region where workspace located.

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

@@ -358,7 +358,7 @@ class _CredentialProvider(LoggingMixin):
 
 
 def get_credentials_and_project_id(*args, **kwargs) -> tuple[google.auth.credentials.Credentials, str]:
-    """Returns the Credentials object for Google API and the associated project_id."""
+    """Return the Credentials object for Google API and the associated project_id."""
     return _CredentialProvider(*args, **kwargs).get_credentials_and_project()
 
 
@@ -398,7 +398,7 @@ def _get_target_principal_and_delegates(
 
 def _get_project_id_from_service_account_email(service_account_email: str) -> str:
     """
-    Extracts project_id from service account's email address.
+    Extract project_id from service account's email address.
 
     :param service_account_email: email of the service account.
 

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

@@ -45,7 +45,7 @@ def make_initialization_workspace_flow(
     without_installation: bool = False,
 ) -> tuple:
     """
-    Creates flow which simulates the initialization of the default project.
+    Create flow which simulates the initialization of the default project.
 
     :param project_id: Required. The ID of the Google Cloud project where workspace located.
     :param region: Required. The ID of the Google Cloud region where workspace located.

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

@@ -309,7 +309,7 @@ class GcpBodyFieldValidator(LoggingMixin):
 
     def _validate_field(self, validation_spec, dictionary_to_validate, parent=None, force_optional=False):
         """
-        Validates if field is OK.
+        Validate if field is OK.
 
         :param validation_spec: specification of the field
         :param dictionary_to_validate: dictionary where the field should be present
@@ -413,7 +413,7 @@ class GcpBodyFieldValidator(LoggingMixin):
 
     def validate(self, body_to_validate: dict) -> None:
         """
-        Validates if the body (dictionary) follows specification that the validator was instantiated with.
+        Validate if the body (dictionary) follows specification that the validator was instantiated with.
 
         Raises ValidationSpecificationException or ValidationFieldException in case of problems
         with specification or the body not conforming to the specification respectively.

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

@@ -19,12 +19,12 @@ from __future__ import annotations
 
 
 def normalize_directory_path(source_object: str | None) -> str | None:
-    """Makes sure dir path ends with a slash."""
+    """Make sure dir path ends with a slash."""
     return source_object + "/" if source_object and not source_object.endswith("/") else source_object
 
 
 def resource_path_to_dict(resource_name: str) -> dict[str, str]:
-    """Converts a path-like GCP resource name into a dictionary.
+    """Convert a path-like GCP resource name into a dictionary.
 
     For example, the path `projects/my-project/locations/my-location/instances/my-instance` will be converted
     to a dict:

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

@@ -57,7 +57,7 @@ def create_evaluate_ops(
     py_interpreter="python3",
 ) -> tuple[MLEngineStartBatchPredictionJobOperator, BeamRunPythonPipelineOperator, PythonOperator]:
     r"""
-    Creates Operators needed for model evaluation and returns.
+    Create Operators needed for model evaluation and returns.
 
     This function is deprecated. All the functionality of legacy MLEngine and new features are available
     on the Vertex AI platform.

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

@@ -151,7 +151,7 @@ def MakeSummary(pcoll, metric_fn, metric_keys):
 
 
 def run(argv=None):
-    """Helper for obtaining prediction summary."""
+    """Obtain prediction summary."""
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--prediction_path",

airflow/providers/google/common/auth_backend/google_openid.py

@@ -52,7 +52,7 @@ def create_client_session():
 
 
 def init_app(_):
-    """Initializes authentication."""
+    """Initialize authentication."""
 
 
 def _get_id_token_from_request(request) -> str | None:
@@ -110,7 +110,7 @@ T = TypeVar("T", bound=Callable)
 
 
 def requires_authentication(function: T):
-    """Decorator for functions that require authentication."""
+    """Decorator for function that require authentication."""
 
     @wraps(function)
     def decorated(*args, **kwargs):

airflow/providers/google/common/hooks/base_google.py

@@ -24,7 +24,6 @@ import json
 import logging
 import os
 import tempfile
-import warnings
 from contextlib import ExitStack, contextmanager
 from subprocess import check_output
 from typing import TYPE_CHECKING, Any, Callable, Generator, Sequence, TypeVar, cast
@@ -36,6 +35,7 @@ import google_auth_httplib2
 import requests
 import tenacity
 from asgiref.sync import sync_to_async
+from deprecated import deprecated
 from gcloud.aio.auth.token import Token
 from google.api_core.exceptions import Forbidden, ResourceExhausted, TooManyRequests
 from google.auth import _cloud_sdk, compute_engine  # type: ignore[attr-defined]
@@ -79,6 +79,8 @@ INVALID_REASONS = [
 
 def is_soft_quota_exception(exception: Exception):
     """
+    Check for quota violation errors.
+
     API for Google services does not have a standardized way to report quota violation errors.
 
     The function has been adapted by trial and error to the following services:
@@ -100,6 +102,8 @@ def is_soft_quota_exception(exception: Exception):
 
 def is_operation_in_progress_exception(exception: Exception) -> bool:
     """
+    Handle operation in-progress exceptions.
+
     Some calls return 429 (too many requests!) or 409 errors (Conflict) in case of operation in progress.
 
     * Google Cloud SQL
@@ -195,7 +199,7 @@ class GoogleBaseHook(BaseHook):
 
     @classmethod
     def get_connection_form_widgets(cls) -> dict[str, Any]:
-        """Returns connection widgets to add to connection form."""
+        """Return connection widgets to add to connection form."""
         from flask_appbuilder.fieldwidgets import BS3PasswordFieldWidget, BS3TextFieldWidget
         from flask_babel import lazy_gettext
         from wtforms import IntegerField, PasswordField, StringField
@@ -228,7 +232,7 @@ class GoogleBaseHook(BaseHook):
 
     @classmethod
     def get_ui_field_behaviour(cls) -> dict[str, Any]:
-        """Returns custom field behaviour."""
+        """Return custom field behaviour."""
         return {
             "hidden_fields": ["host", "schema", "login", "password", "port", "extra"],
             "relabeling": {},
@@ -249,7 +253,7 @@ class GoogleBaseHook(BaseHook):
         self._cached_project_id: str | None = None
 
     def get_credentials_and_project_id(self) -> tuple[google.auth.credentials.Credentials, str | None]:
-        """Returns the Credentials object for Google API and the associated project_id."""
+        """Return the Credentials object for Google API and the associated project_id."""
         if self._cached_credentials is not None:
             return self._cached_credentials, self._cached_project_id
 
@@ -299,12 +303,12 @@ class GoogleBaseHook(BaseHook):
         return credentials, project_id
 
     def get_credentials(self) -> google.auth.credentials.Credentials:
-        """Returns the Credentials object for Google API."""
+        """Return the Credentials object for Google API."""
         credentials, _ = self.get_credentials_and_project_id()
         return credentials
 
     def _get_access_token(self) -> str:
-        """Returns a valid access token from Google API Credentials."""
+        """Return a valid access token from Google API Credentials."""
         credentials = self.get_credentials()
         auth_req = google.auth.transport.requests.Request()
         # credentials.token is None
@@ -315,7 +319,7 @@ class GoogleBaseHook(BaseHook):
     @functools.lru_cache(maxsize=None)
     def _get_credentials_email(self) -> str:
         """
-        Returns the email address associated with the currently logged in account.
+        Return the email address associated with the currently logged in account.
 
         If a service account is used, it returns the service account.
         If user authentication (e.g. gcloud auth) is used, it returns the e-mail account of that user.
@@ -341,7 +345,7 @@ class GoogleBaseHook(BaseHook):
         return oauth2_client.tokeninfo().execute()["email"]
 
     def _authorize(self) -> google_auth_httplib2.AuthorizedHttp:
-        """Returns an authorized HTTP object to be used to build a Google cloud service hook connection."""
+        """Return an authorized HTTP object to be used to build a Google cloud service hook connection."""
         credentials = self.get_credentials()
         http = build_http()
         http = set_user_agent(http, "airflow/" + version.version)
@@ -350,7 +354,7 @@ class GoogleBaseHook(BaseHook):
 
     def _get_field(self, f: str, default: Any = None) -> Any:
         """
-        Fetches a field from extras, and returns it.
+        Fetch a field from extras, and returns it.
 
         This is some Airflow magic. The google_cloud_platform hook type adds
         custom UI elements to the hook page, which allow admins to specify
@@ -390,6 +394,10 @@ class GoogleBaseHook(BaseHook):
             )
 
     @property
+    @deprecated(
+        reason="Please use `airflow.providers.google.common.consts.CLIENT_INFO`.",
+        category=AirflowProviderDeprecationWarning,
+    )
     def client_info(self) -> ClientInfo:
         """
         Return client information used to generate a user-agent for API calls.
@@ -400,11 +408,6 @@ class GoogleBaseHook(BaseHook):
         the Google Cloud. It is not supported by The Google APIs Python Client that use Discovery
         based APIs.
         """
-        warnings.warn(
-            "This method is deprecated, please use `airflow.providers.google.common.consts.CLIENT_INFO`.",
-            AirflowProviderDeprecationWarning,
-            stacklevel=2,
-        )
         return CLIENT_INFO
 
     @property
@@ -420,7 +423,7 @@ class GoogleBaseHook(BaseHook):
 
     @staticmethod
     def quota_retry(*args, **kwargs) -> Callable:
-        """Provides a mechanism to repeat requests in response to exceeding a temporary quota limit."""
+        """Provide a mechanism to repeat requests in response to exceeding a temporary quota limit."""
 
         def decorator(fun: Callable):
             default_kwargs = {
@@ -436,7 +439,7 @@ class GoogleBaseHook(BaseHook):
 
     @staticmethod
     def operation_in_progress_retry(*args, **kwargs) -> Callable[[T], T]:
-        """Provides a mechanism to repeat requests in response to operation in progress (HTTP 409) limit."""
+        """Provide a mechanism to repeat requests in response to operation in progress (HTTP 409) limit."""
 
         def decorator(fun: T):
             default_kwargs = {
@@ -453,7 +456,7 @@ class GoogleBaseHook(BaseHook):
     @staticmethod
     def fallback_to_default_project_id(func: Callable[..., RT]) -> Callable[..., RT]:
         """
-        Decorator that provides fallback for Google Cloud project id.
+        Provide fallback for Google Cloud project id. To be used as a decorator.
 
         If the project is None it will be replaced with the project_id from the
         service account the Hook is authenticated with. Project id can be specified
@@ -486,7 +489,7 @@ class GoogleBaseHook(BaseHook):
     @staticmethod
     def provide_gcp_credential_file(func: T) -> T:
         """
-        Provides a Google Cloud credentials for Application Default Credentials (ADC) strategy support.
+        Provide a Google Cloud credentials for Application Default Credentials (ADC) strategy support.
 
         It is recommended to use ``provide_gcp_credential_file_as_context`` context
         manager to limit the scope when authorization data is available. Using context
@@ -503,7 +506,7 @@ class GoogleBaseHook(BaseHook):
     @contextmanager
     def provide_gcp_credential_file_as_context(self) -> Generator[str | None, None, None]:
         """
-        Provides a Google Cloud credentials for Application Default Credentials (ADC) strategy support.
+        Provide a Google Cloud credentials for Application Default Credentials (ADC) strategy support.
 
         See:
             `Application Default Credentials (ADC)
@@ -539,7 +542,7 @@ class GoogleBaseHook(BaseHook):
     @contextmanager
     def provide_authorized_gcloud(self) -> Generator[None, None, None]:
         """
-        Provides a separate gcloud configuration with current credentials.
+        Provide a separate gcloud configuration with current credentials.
 
         The gcloud tool allows you to login to Google Cloud only - ``gcloud auth login`` and
         for the needs of Application Default Credentials ``gcloud auth application-default login``.
@@ -691,11 +694,15 @@ class GoogleBaseAsyncHook(BaseHook):
         return self._sync_hook
 
     async def get_token(self, *, session: ClientSession | None = None) -> _CredentialsToken:
-        """Returns a Token instance for use in [gcloud-aio](https://talkiq.github.io/gcloud-aio/) clients."""
+        """Return a Token instance for use in [gcloud-aio](https://talkiq.github.io/gcloud-aio/) clients."""
         sync_hook = await self.get_sync_hook()
         return await _CredentialsToken.from_hook(sync_hook, session=session)
 
     async def service_file_as_context(self) -> Any:
-        """This is the async equivalent of the non-async GoogleBaseHook's `provide_gcp_credential_file_as_context` method."""
+        """
+        Provide a Google Cloud credentials for Application Default Credentials (ADC) strategy support.
+
+        This is the async equivalent of the non-async GoogleBaseHook's `provide_gcp_credential_file_as_context` method.
+        """
         sync_hook = await self.get_sync_hook()
         return await sync_to_async(sync_hook.provide_gcp_credential_file_as_context)()

airflow/providers/google/common/hooks/discovery_api.py

@@ -66,7 +66,7 @@ class GoogleDiscoveryApiHook(GoogleBaseHook):
 
     def get_conn(self) -> Resource:
         """
-        Creates an authenticated api client for the given api service name and credentials.
+        Create an authenticated api client for the given api service name and credentials.
 
         :return: the authenticated api service.
         """
@@ -84,7 +84,7 @@ class GoogleDiscoveryApiHook(GoogleBaseHook):
 
     def query(self, endpoint: str, data: dict, paginate: bool = False, num_retries: int = 0) -> dict:
         """
-        Creates a dynamic API call to any Google API registered in Google's API Client Library and queries it.
+        Create a dynamic API call to any Google API registered in Google's API Client Library and queries it.
 
         :param endpoint: The client libraries path to the api call's executing method.
             For example: 'analyticsreporting.reports.batchGet'

airflow/providers/google/common/utils/id_token_credentials.py

@@ -81,7 +81,7 @@ def _load_credentials_from_file(
     filename: str, target_audience: str | None
 ) -> google_auth_credentials.Credentials | None:
     """
-    Loads credentials from a file.
+    Load credentials from a file.
 
     The credentials file must be a service account key or a stored authorized user credential.
 
@@ -129,7 +129,7 @@ def _load_credentials_from_file(
 def _get_explicit_environ_credentials(
     target_audience: str | None,
 ) -> google_auth_credentials.Credentials | None:
-    """Gets credentials from the GOOGLE_APPLICATION_CREDENTIALS environment variable."""
+    """Get credentials from the GOOGLE_APPLICATION_CREDENTIALS environment variable."""
     explicit_file = os.environ.get(environment_vars.CREDENTIALS)
 
     if explicit_file is None:
@@ -145,7 +145,7 @@ def _get_explicit_environ_credentials(
 def _get_gcloud_sdk_credentials(
     target_audience: str | None,
 ) -> google_auth_credentials.Credentials | None:
-    """Gets the credentials and project ID from the Cloud SDK."""
+    """Get the credentials and project ID from the Cloud SDK."""
     from google.auth import _cloud_sdk  # type: ignore[attr-defined]
 
     # Check if application default credentials exist.
@@ -162,7 +162,7 @@ def _get_gcloud_sdk_credentials(
 def _get_gce_credentials(
     target_audience: str | None, request: google.auth.transport.Request | None = None
 ) -> google_auth_credentials.Credentials | None:
-    """Gets credentials and project ID from the GCE Metadata Service."""
+    """Get credentials and project ID from the GCE Metadata Service."""
     # Ping requires a transport, but we want application default credentials
     # to require no arguments. So, we'll use the _http_client transport which
     # uses http.client. This is only acceptable because the metadata server
@@ -191,7 +191,7 @@ def _get_gce_credentials(
 def get_default_id_token_credentials(
     target_audience: str | None, request: google.auth.transport.Request = None
 ) -> google_auth_credentials.Credentials:
-    """Gets the default ID Token credentials for the current environment.
+    """Get the default ID Token credentials for the current environment.
 
     `Application Default Credentials`_ provides an easy way to obtain credentials to call Google APIs for
     server-to-server or local applications.

airflow/providers/google/firebase/hooks/firestore.py

@@ -65,7 +65,7 @@ class CloudFirestoreHook(GoogleBaseHook):
 
     def get_conn(self):
         """
-        Retrieves the connection to Cloud Firestore.
+        Retrieve the connection to Cloud Firestore.
 
         :return: Google Cloud Firestore services object.
         """
@@ -86,7 +86,7 @@ class CloudFirestoreHook(GoogleBaseHook):
         self, body: dict, database_id: str = "(default)", project_id: str | None = None
     ) -> None:
         """
-        Starts a export with the specified configuration.
+        Start a export with the specified configuration.
 
         :param database_id: The Database ID.
         :param body: The request body.
@@ -110,7 +110,7 @@ class CloudFirestoreHook(GoogleBaseHook):
 
     def _wait_for_operation_to_complete(self, operation_name: str) -> None:
         """
-        Waits for the named operation to complete - checks status of the asynchronous call.
+        Wait for the named operation to complete - checks status of the asynchronous call.
 
         :param operation_name: The name of the operation.
         :return: The response returned by the operation.

airflow/providers/google/get_provider_info.py

@@ -28,8 +28,9 @@ def get_provider_info():
         "name": "Google",
         "description": "Google services including:\n\n  - `Google Ads <https://ads.google.com/>`__\n  - `Google Cloud (GCP) <https://cloud.google.com/>`__\n  - `Google Firebase <https://firebase.google.com/>`__\n  - `Google LevelDB <https://github.com/google/leveldb/>`__\n  - `Google Marketing Platform <https://marketingplatform.google.com/>`__\n  - `Google Workspace <https://workspace.google.com/>`__ (formerly Google Suite)\n",
         "state": "ready",
-        "source-date-epoch": 1705912108,
+        "source-date-epoch": 1707636385,
         "versions": [
+            "10.15.0",
             "10.14.0",
             "10.13.1",
             "10.13.0",
@@ -92,7 +93,7 @@ def get_provider_info():
             "gcsfs>=2023.10.0",
             "google-ads>=22.1.0",
             "google-analytics-admin",
-            "google-api-core>=2.11.0",
+            "google-api-core>=2.11.0,!=2.16.0",
             "google-api-python-client>=1.6.0",
             "google-auth>=1.0.0",
             "google-auth-httplib2>=0.0.1",
@@ -1215,6 +1216,10 @@ def get_provider_info():
                 "integration-name": "Google Cloud",
                 "python-modules": ["airflow.providers.google.cloud.triggers.cloud_batch"],
             },
+            {
+                "integration-name": "Google Vertex AI",
+                "python-modules": ["airflow.providers.google.cloud.triggers.vertex_ai"],
+            },
         ],
         "transfers": [
             {

airflow/providers/google/leveldb/hooks/leveldb.py

@@ -53,7 +53,7 @@ class LevelDBHook(BaseHook):
 
     def get_conn(self, name: str = "/tmp/testdb/", create_if_missing: bool = False, **kwargs) -> DB:
         """
-        Creates `Plyvel DB <https://plyvel.readthedocs.io/en/latest/api.html#DB>`__.
+        Create `Plyvel DB <https://plyvel.readthedocs.io/en/latest/api.html#DB>`__.
 
         :param name: path to create database e.g. `/tmp/testdb/`)
         :param create_if_missing: whether a new database should be created if needed
@@ -66,7 +66,7 @@ class LevelDBHook(BaseHook):
         return self.db
 
     def close_conn(self) -> None:
-        """Closes connection."""
+        """Close connection."""
         db = self.db
         if db is not None:
             db.close()

airflow/providers/google/marketing_platform/hooks/analytics.py

@@ -17,9 +17,9 @@
 # under the License.
 from __future__ import annotations
 
-import warnings
 from typing import Any
 
+from deprecated import deprecated
 from googleapiclient.discovery import Resource, build
 from googleapiclient.http import MediaFileUpload
 
@@ -27,18 +27,15 @@ from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.providers.google.common.hooks.base_google import GoogleBaseHook
 
 
+@deprecated(
+    reason="The `GoogleAnalyticsHook` class is deprecated, please use `GoogleAnalyticsAdminHook` instead.",
+    category=AirflowProviderDeprecationWarning,
+)
 class GoogleAnalyticsHook(GoogleBaseHook):
     """Hook for Google Analytics 360."""
 
     def __init__(self, api_version: str = "v3", *args, **kwargs):
         super().__init__(*args, **kwargs)
-        warnings.warn(
-            f"The `{type(self).__name__}` class is deprecated, please use "
-            f"`GoogleAnalyticsAdminHook` instead.",
-            AirflowProviderDeprecationWarning,
-            stacklevel=2,
-        )
-
         self.api_version = api_version
         self._conn = None
 
@@ -58,7 +55,7 @@ class GoogleAnalyticsHook(GoogleBaseHook):
         return result
 
     def get_conn(self) -> Resource:
-        """Retrieves connection to Google Analytics 360."""
+        """Retrieve connection to Google Analytics 360."""
         if not self._conn:
             http_authorized = self._authorize()
             self._conn = build(
@@ -70,7 +67,7 @@ class GoogleAnalyticsHook(GoogleBaseHook):
         return self._conn
 
     def list_accounts(self) -> list[dict[str, Any]]:
-        """Lists accounts list from Google Analytics 360."""
+        """List accounts list from Google Analytics 360."""
         self.log.info("Retrieving accounts list...")
         conn = self.get_conn()
         accounts = conn.management().accounts()
@@ -81,7 +78,7 @@ class GoogleAnalyticsHook(GoogleBaseHook):
         self, account_id: str, web_property_id: str, web_property_ad_words_link_id: str
     ) -> dict[str, Any]:
         """
-        Returns a web property-Google Ads link to which the user has access.
+        Return a web property-Google Ads link to which the user has access.
 
         :param account_id: ID of the account which the given web property belongs to.
         :param web_property_id: Web property-Google Ads link UA-string.
@@ -105,7 +102,7 @@ class GoogleAnalyticsHook(GoogleBaseHook):
 
     def list_ad_words_links(self, account_id: str, web_property_id: str) -> list[dict[str, Any]]:
         """
-        Lists webProperty-Google Ads links for a given web property.
+        List webProperty-Google Ads links for a given web property.
 
         :param account_id: ID of the account which the given web property belongs to.
         :param web_property_id: Web property UA-string to retrieve the Google Ads links for.
@@ -128,7 +125,7 @@ class GoogleAnalyticsHook(GoogleBaseHook):
         resumable_upload: bool = False,
     ) -> None:
         """
-        Uploads file to GA via the Data Import API.
+        Upload file to GA via the Data Import API.
 
         :param file_location: The path and name of the file to upload.
         :param account_id: The GA account Id to which the data upload belongs.
@@ -165,7 +162,7 @@ class GoogleAnalyticsHook(GoogleBaseHook):
         delete_request_body: dict[str, Any],
     ) -> None:
         """
-        Deletes the uploaded data for a given account/property/dataset.
+        Delete the uploaded data for a given account/property/dataset.
 
         :param account_id: The GA account Id to which the data upload belongs.
         :param web_property_id: UA-string associated with the upload.