apache-airflow-providers-google 10.22.0rc1__py3-none-any.whl → 10.23.0__py3-none-any.whl

airflow/providers/google/cloud/operators/vertex_ai/generative_model.py

@@ -21,18 +21,20 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Sequence
 
-from deprecated import deprecated
+from google.cloud.aiplatform_v1beta1 import types as types_v1beta1
 
 from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.providers.google.cloud.hooks.vertex_ai.generative_model import GenerativeModelHook
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
+from airflow.providers.google.common.deprecated import deprecated
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context
 
 
 @deprecated(
-    reason="This operator is deprecated and will be removed after 01.01.2025, please use `TextGenerationModelPredictOperator`.",
+    planned_removal_date="January 01, 2025",
+    use_instead="TextGenerationModelPredictOperator",
     category=AirflowProviderDeprecationWarning,
 )
 class PromptLanguageModelOperator(GoogleCloudBaseOperator):
@@ -121,7 +123,8 @@ class PromptLanguageModelOperator(GoogleCloudBaseOperator):
 
 
 @deprecated(
-    reason="This operator is deprecated and will be removed after 01.01.2025, please use `TextEmbeddingModelGetEmbeddingsOperator`.",
+    planned_removal_date="January 01, 2025",
+    use_instead="TextEmbeddingModelGetEmbeddingsOperator",
     category=AirflowProviderDeprecationWarning,
 )
 class GenerateTextEmbeddingsOperator(GoogleCloudBaseOperator):
@@ -189,7 +192,8 @@ class GenerateTextEmbeddingsOperator(GoogleCloudBaseOperator):
 
 
 @deprecated(
-    reason="This operator is deprecated and will be removed after 01.01.2025, please use `GenerativeModelGenerateContentOperator`.",
+    planned_removal_date="January 01, 2025",
+    use_instead="GenerativeModelGenerateContentOperator",
     category=AirflowProviderDeprecationWarning,
 )
 class PromptMultimodalModelOperator(GoogleCloudBaseOperator):
@@ -265,7 +269,8 @@ class PromptMultimodalModelOperator(GoogleCloudBaseOperator):
 
 
 @deprecated(
-    reason="This operator is deprecated and will be removed after 01.01.2025, please use `GenerativeModelGenerateContentOperator`.",
+    planned_removal_date="January 01, 2025",
+    use_instead="GenerativeModelGenerateContentOperator",
     category=AirflowProviderDeprecationWarning,
 )
 class PromptMultimodalModelWithMediaOperator(GoogleCloudBaseOperator):
@@ -504,12 +509,14 @@ class GenerativeModelGenerateContentOperator(GoogleCloudBaseOperator):
 
     :param project_id: Required. The ID of the Google Cloud project that the
         service belongs to (templated).
-    :param contents: Required. The multi-part content of a message that a user or a program
-        gives to the generative model, in order to elicit a specific response.
     :param location: Required. The ID of the Google Cloud location that the
         service belongs to (templated).
+    :param contents: Required. The multi-part content of a message that a user or a program
+        gives to the generative model, in order to elicit a specific response.
     :param generation_config: Optional. Generation configuration settings.
     :param safety_settings: Optional. Per request settings for blocking unsafe content.
+    :param tools: Optional. A list of tools available to the model during evaluation, such as a data store.
+    :param system_instruction: Optional. An instruction given to the model to guide its behavior.
     :param pretrained_model: By default uses the pre-trained model `gemini-pro`,
         supporting prompts with text-only input, including natural language
         tasks, multi-turn text and code chat, and code generation. It can
@@ -525,17 +532,18 @@ class GenerativeModelGenerateContentOperator(GoogleCloudBaseOperator):
         account from the list granting this role to the originating account (templated).
     """
 
-    template_fields = ("location", "project_id", "impersonation_chain", "contents")
+    template_fields = ("location", "project_id", "impersonation_chain", "contents", "pretrained_model")
 
     def __init__(
         self,
         *,
         project_id: str,
-        contents: list,
         location: str,
+        contents: list,
         tools: list | None = None,
         generation_config: dict | None = None,
         safety_settings: dict | None = None,
+        system_instruction: str | None = None,
         pretrained_model: str = "gemini-pro",
         gcp_conn_id: str = "google_cloud_default",
         impersonation_chain: str | Sequence[str] | None = None,
@@ -548,6 +556,7 @@ class GenerativeModelGenerateContentOperator(GoogleCloudBaseOperator):
         self.tools = tools
         self.generation_config = generation_config
         self.safety_settings = safety_settings
+        self.system_instruction = system_instruction
         self.pretrained_model = pretrained_model
         self.gcp_conn_id = gcp_conn_id
         self.impersonation_chain = impersonation_chain
@@ -564,6 +573,7 @@ class GenerativeModelGenerateContentOperator(GoogleCloudBaseOperator):
             tools=self.tools,
             generation_config=self.generation_config,
             safety_settings=self.safety_settings,
+            system_instruction=self.system_instruction,
             pretrained_model=self.pretrained_model,
         )
 
@@ -571,3 +581,264 @@ class GenerativeModelGenerateContentOperator(GoogleCloudBaseOperator):
         self.xcom_push(context, key="model_response", value=response)
 
         return response
+
+
+class SupervisedFineTuningTrainOperator(GoogleCloudBaseOperator):
+    """
+    Use the Supervised Fine Tuning API to create a tuning job.
+
+    :param project_id: Required. The ID of the Google Cloud project that the
+        service belongs to.
+    :param location: Required. The ID of the Google Cloud location that the service belongs to.
+    :param source_model: Required. A pre-trained model optimized for performing natural
+        language tasks such as classification, summarization, extraction, content
+        creation, and ideation.
+    :param train_dataset: Required. Cloud Storage URI of your training dataset. The dataset
+        must be formatted as a JSONL file. For best results, provide at least 100 to 500 examples.
+    :param tuned_model_display_name: Optional. Display name of the TunedModel. The name can be up
+        to 128 characters long and can consist of any UTF-8 characters.
+    :param validation_dataset: Optional. Cloud Storage URI of your training dataset. The dataset must be
+        formatted as a JSONL file. For best results, provide at least 100 to 500 examples.
+    :param epochs: Optional. To optimize performance on a specific dataset, try using a higher
+        epoch value. Increasing the number of epochs might improve results. However, be cautious
+        about over-fitting, especially when dealing with small datasets. If over-fitting occurs,
+        consider lowering the epoch number.
+    :param adapter_size: Optional. Adapter size for tuning.
+    :param learning_multiplier_rate: Optional. Multiplier for adjusting the default learning rate.
+    :param gcp_conn_id: The connection ID to use connecting to Google Cloud.
+    :param impersonation_chain: Optional service account to impersonate using short-term
+        credentials, or chained list of accounts required to get the access_token
+        of the last account in the list, which will be impersonated in the request.
+        If set as a string, the account must grant the originating account
+        the Service Account Token Creator IAM role.
+        If set as a sequence, the identities from the list must grant
+        Service Account Token Creator IAM role to the directly preceding identity, with first
+        account from the list granting this role to the originating account (templated).
+    """
+
+    template_fields = ("location", "project_id", "impersonation_chain", "train_dataset", "validation_dataset")
+
+    def __init__(
+        self,
+        *,
+        project_id: str,
+        location: str,
+        source_model: str,
+        train_dataset: str,
+        tuned_model_display_name: str | None = None,
+        validation_dataset: str | None = None,
+        epochs: int | None = None,
+        adapter_size: int | None = None,
+        learning_rate_multiplier: float | None = None,
+        gcp_conn_id: str = "google_cloud_default",
+        impersonation_chain: str | Sequence[str] | None = None,
+        **kwargs,
+    ) -> None:
+        super().__init__(**kwargs)
+        self.project_id = project_id
+        self.location = location
+        self.source_model = source_model
+        self.train_dataset = train_dataset
+        self.tuned_model_display_name = tuned_model_display_name
+        self.validation_dataset = validation_dataset
+        self.epochs = epochs
+        self.adapter_size = adapter_size
+        self.learning_rate_multiplier = learning_rate_multiplier
+        self.gcp_conn_id = gcp_conn_id
+        self.impersonation_chain = impersonation_chain
+
+    def execute(self, context: Context):
+        self.hook = GenerativeModelHook(
+            gcp_conn_id=self.gcp_conn_id,
+            impersonation_chain=self.impersonation_chain,
+        )
+        response = self.hook.supervised_fine_tuning_train(
+            project_id=self.project_id,
+            location=self.location,
+            source_model=self.source_model,
+            train_dataset=self.train_dataset,
+            validation_dataset=self.validation_dataset,
+            epochs=self.epochs,
+            adapter_size=self.adapter_size,
+            learning_rate_multiplier=self.learning_rate_multiplier,
+            tuned_model_display_name=self.tuned_model_display_name,
+        )
+
+        self.log.info("Tuned Model Name: %s", response.tuned_model_name)
+        self.log.info("Tuned Model Endpoint Name: %s", response.tuned_model_endpoint_name)
+
+        self.xcom_push(context, key="tuned_model_name", value=response.tuned_model_name)
+        self.xcom_push(context, key="tuned_model_endpoint_name", value=response.tuned_model_endpoint_name)
+
+        result = {
+            "tuned_model_name": response.tuned_model_name,
+            "tuned_model_endpoint_name": response.tuned_model_endpoint_name,
+        }
+
+        return result
+
+
+class CountTokensOperator(GoogleCloudBaseOperator):
+    """
+    Use the Vertex AI Count Tokens API to calculate the number of input tokens before sending a request to the Gemini API.
+
+    :param project_id: Required. The ID of the Google Cloud project that the
+        service belongs to (templated).
+    :param location: Required. The ID of the Google Cloud location that the
+        service belongs to (templated).
+    :param contents: Required. The multi-part content of a message that a user or a program
+        gives to the generative model, in order to elicit a specific response.
+    :param pretrained_model: By default uses the pre-trained model `gemini-pro`,
+        supporting prompts with text-only input, including natural language
+        tasks, multi-turn text and code chat, and code generation. It can
+        output text and code.
+    :param gcp_conn_id: The connection ID to use connecting to Google Cloud.
+    :param impersonation_chain: Optional service account to impersonate using short-term
+        credentials, or chained list of accounts required to get the access_token
+        of the last account in the list, which will be impersonated in the request.
+        If set as a string, the account must grant the originating account
+        the Service Account Token Creator IAM role.
+        If set as a sequence, the identities from the list must grant
+        Service Account Token Creator IAM role to the directly preceding identity, with first
+        account from the list granting this role to the originating account (templated).
+    """
+
+    template_fields = ("location", "project_id", "impersonation_chain", "contents", "pretrained_model")
+
+    def __init__(
+        self,
+        *,
+        project_id: str,
+        location: str,
+        contents: list,
+        pretrained_model: str = "gemini-pro",
+        gcp_conn_id: str = "google_cloud_default",
+        impersonation_chain: str | Sequence[str] | None = None,
+        **kwargs,
+    ) -> None:
+        super().__init__(**kwargs)
+        self.project_id = project_id
+        self.location = location
+        self.contents = contents
+        self.pretrained_model = pretrained_model
+        self.gcp_conn_id = gcp_conn_id
+        self.impersonation_chain = impersonation_chain
+
+    def execute(self, context: Context):
+        self.hook = GenerativeModelHook(
+            gcp_conn_id=self.gcp_conn_id,
+            impersonation_chain=self.impersonation_chain,
+        )
+        response = self.hook.count_tokens(
+            project_id=self.project_id,
+            location=self.location,
+            contents=self.contents,
+            pretrained_model=self.pretrained_model,
+        )
+
+        self.log.info("Total tokens: %s", response.total_tokens)
+        self.log.info("Total billable characters: %s", response.total_billable_characters)
+
+        self.xcom_push(context, key="total_tokens", value=response.total_tokens)
+        self.xcom_push(context, key="total_billable_characters", value=response.total_billable_characters)
+
+        return types_v1beta1.CountTokensResponse.to_dict(response)
+
+
+class RunEvaluationOperator(GoogleCloudBaseOperator):
+    """
+    Use the Rapid Evaluation API to evaluate a model.
+
+    :param project_id: Required. The ID of the Google Cloud project that the service belongs to.
+    :param location: Required. The ID of the Google Cloud location that the service belongs to.
+    :param pretrained_model: Required. A pre-trained model optimized for performing natural
+        language tasks such as classification, summarization, extraction, content
+        creation, and ideation.
+    :param eval_dataset: Required. A fixed dataset for evaluating a model against. Adheres to Rapid Evaluation API.
+    :param metrics: Required. A list of evaluation metrics to be used in the experiment. Adheres to Rapid Evaluation API.
+    :param experiment_name: Required. The name of the evaluation experiment.
+    :param experiment_run_name: Required. The specific run name or ID for this experiment.
+    :param prompt_template: Required. The template used to format the model's prompts during evaluation. Adheres to Rapid Evaluation API.
+    :param generation_config: Optional. A dictionary containing generation parameters for the model.
+    :param safety_settings: Optional. A dictionary specifying harm category thresholds for blocking model outputs.
+    :param system_instruction: Optional. An instruction given to the model to guide its behavior.
+    :param tools: Optional. A list of tools available to the model during evaluation, such as a data store.
+    :param gcp_conn_id: The connection ID to use connecting to Google Cloud.
+    :param impersonation_chain: Optional service account to impersonate using short-term
+        credentials, or chained list of accounts required to get the access_token
+        of the last account in the list, which will be impersonated in the request.
+        If set as a string, the account must grant the originating account
+        the Service Account Token Creator IAM role.
+        If set as a sequence, the identities from the list must grant
+        Service Account Token Creator IAM role to the directly preceding identity, with first
+        account from the list granting this role to the originating account (templated).
+    """
+
+    template_fields = (
+        "location",
+        "project_id",
+        "impersonation_chain",
+        "pretrained_model",
+        "eval_dataset",
+        "prompt_template",
+        "experiment_name",
+        "experiment_run_name",
+    )
+
+    def __init__(
+        self,
+        *,
+        project_id: str,
+        location: str,
+        pretrained_model: str,
+        eval_dataset: dict,
+        metrics: list,
+        experiment_name: str,
+        experiment_run_name: str,
+        prompt_template: str,
+        generation_config: dict | None = None,
+        safety_settings: dict | None = None,
+        system_instruction: str | None = None,
+        tools: list | None = None,
+        gcp_conn_id: str = "google_cloud_default",
+        impersonation_chain: str | Sequence[str] | None = None,
+        **kwargs,
+    ) -> None:
+        super().__init__(**kwargs)
+
+        self.project_id = project_id
+        self.location = location
+        self.pretrained_model = pretrained_model
+        self.eval_dataset = eval_dataset
+        self.metrics = metrics
+        self.experiment_name = experiment_name
+        self.experiment_run_name = experiment_run_name
+        self.prompt_template = prompt_template
+        self.generation_config = generation_config
+        self.safety_settings = safety_settings
+        self.system_instruction = system_instruction
+        self.tools = tools
+        self.gcp_conn_id = gcp_conn_id
+        self.impersonation_chain = impersonation_chain
+
+    def execute(self, context: Context):
+        self.hook = GenerativeModelHook(
+            gcp_conn_id=self.gcp_conn_id,
+            impersonation_chain=self.impersonation_chain,
+        )
+        response = self.hook.run_evaluation(
+            project_id=self.project_id,
+            location=self.location,
+            pretrained_model=self.pretrained_model,
+            eval_dataset=self.eval_dataset,
+            metrics=self.metrics,
+            experiment_name=self.experiment_name,
+            experiment_run_name=self.experiment_run_name,
+            prompt_template=self.prompt_template,
+            generation_config=self.generation_config,
+            safety_settings=self.safety_settings,
+            system_instruction=self.system_instruction,
+            tools=self.tools,
+        )
+
+        return response.summary_metrics

airflow/providers/google/cloud/operators/vertex_ai/model_service.py

@@ -362,6 +362,7 @@ class UploadModelOperator(GoogleCloudBaseOperator):
     :param project_id: Required. The ID of the Google Cloud project that the service belongs to.
     :param region: Required. The ID of the Google Cloud region that the service belongs to.
     :param model: Required. The Model to create.
+    :param parent_model: The name of the parent model to create a new version under.
     :param retry: Designation of what errors, if any, should be retried.
     :param timeout: The timeout for this request.
     :param metadata: Strings which should be sent along with the request as metadata.
@@ -385,6 +386,7 @@ class UploadModelOperator(GoogleCloudBaseOperator):
         project_id: str,
         region: str,
         model: Model | dict,
+        parent_model: str | None = None,
         retry: Retry | _MethodDefault = DEFAULT,
         timeout: float | None = None,
         metadata: Sequence[tuple[str, str]] = (),
@@ -396,6 +398,7 @@ class UploadModelOperator(GoogleCloudBaseOperator):
         self.project_id = project_id
         self.region = region
         self.model = model
+        self.parent_model = parent_model
         self.retry = retry
         self.timeout = timeout
         self.metadata = metadata
@@ -412,6 +415,7 @@ class UploadModelOperator(GoogleCloudBaseOperator):
             project_id=self.project_id,
             region=self.region,
             model=self.model,
+            parent_model=self.parent_model,
             retry=self.retry,
             timeout=self.timeout,
             metadata=self.metadata,

airflow/providers/google/cloud/secrets/secret_manager.py

@@ -21,7 +21,6 @@ from __future__ import annotations
 import logging
 from typing import Sequence
 
-from deprecated import deprecated
 from google.auth.exceptions import DefaultCredentialsError
 
 from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
@@ -30,6 +29,7 @@ from airflow.providers.google.cloud.utils.credentials_provider import (
     _get_target_principal_and_delegates,
     get_credentials_and_project_id,
 )
+from airflow.providers.google.common.deprecated import deprecated
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
 from airflow.secrets import BaseSecretsBackend
 from airflow.utils.log.logging_mixin import LoggingMixin
@@ -162,10 +162,8 @@ class CloudSecretManagerBackend(BaseSecretsBackend, LoggingMixin):
         return self._get_secret(self.connections_prefix, conn_id)
 
     @deprecated(
-        reason=(
-            "Method `CloudSecretManagerBackend.get_conn_uri` is deprecated and will be removed "
-            "in a future release.  Please use method `get_conn_value` instead."
-        ),
+        planned_removal_date="November 01, 2024",
+        use_instead="get_conn_value",
         category=AirflowProviderDeprecationWarning,
     )
     def get_conn_uri(self, conn_id: str) -> str | None:

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

@@ -23,15 +23,14 @@ import warnings
 from datetime import timedelta
 from typing import TYPE_CHECKING, Any, Sequence
 
-from deprecated import deprecated
-
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning, AirflowSkipException
+from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
 from airflow.providers.google.cloud.hooks.bigquery import BigQueryHook
 from airflow.providers.google.cloud.triggers.bigquery import (
     BigQueryTableExistenceTrigger,
     BigQueryTablePartitionExistenceTrigger,
 )
+from airflow.providers.google.common.deprecated import deprecated
 from airflow.sensors.base import BaseSensorOperator
 
 if TYPE_CHECKING:
@@ -144,15 +143,9 @@ class BigQueryTableExistenceSensor(BaseSensorOperator):
         if event:
             if event["status"] == "success":
                 return event["message"]
-            # TODO: remove this if check when min_airflow_version is set to higher than 2.7.1
-            if self.soft_fail:
-                raise AirflowSkipException(event["message"])
             raise AirflowException(event["message"])
 
-        # TODO: remove this if check when min_airflow_version is set to higher than 2.7.1
         message = "No event received in trigger callback"
-        if self.soft_fail:
-            raise AirflowSkipException(message)
         raise AirflowException(message)
 
 
@@ -260,25 +253,16 @@ class BigQueryTablePartitionExistenceSensor(BaseSensorOperator):
             if event["status"] == "success":
                 return event["message"]
 
-            # TODO: remove this if check when min_airflow_version is set to higher than 2.7.1
-            if self.soft_fail:
-                raise AirflowSkipException(event["message"])
             raise AirflowException(event["message"])
 
-        # TODO: remove this if check when min_airflow_version is set to higher than 2.7.1
         message = "No event received in trigger callback"
-        if self.soft_fail:
-            raise AirflowSkipException(message)
         raise AirflowException(message)
 
 
 @deprecated(
-    reason=(
-        "Class `BigQueryTableExistenceAsyncSensor` is deprecated and "
-        "will be removed in a future release. "
-        "Please use `BigQueryTableExistenceSensor` and "
-        "set `deferrable` attribute to `True` instead"
-    ),
+    planned_removal_date="November 01, 2024",
+    use_instead="BigQueryTableExistenceSensor",
+    instructions="Please use BigQueryTableExistenceSensor and set deferrable attribute to True.",
     category=AirflowProviderDeprecationWarning,
 )
 class BigQueryTableExistenceAsyncSensor(BigQueryTableExistenceSensor):
@@ -315,12 +299,9 @@ class BigQueryTableExistenceAsyncSensor(BigQueryTableExistenceSensor):
 
 
 @deprecated(
-    reason=(
-        "Class `BigQueryTableExistencePartitionAsyncSensor` is deprecated and "
-        "will be removed in a future release. "
-        "Please use `BigQueryTablePartitionExistenceSensor` and "
-        "set `deferrable` attribute to `True` instead"
-    ),
+    planned_removal_date="November 01, 2024",
+    use_instead="BigQueryTablePartitionExistenceSensor",
+    instructions="Please use BigQueryTablePartitionExistenceSensor and set deferrable attribute to True.",
     category=AirflowProviderDeprecationWarning,
 )
 class BigQueryTableExistencePartitionAsyncSensor(BigQueryTablePartitionExistenceSensor):

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

@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING, Sequence
 from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
 from google.cloud.bigquery_datatransfer_v1 import TransferState
 
-from airflow.exceptions import AirflowException, AirflowSkipException
+from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.bigquery_dts import BiqQueryDataTransferServiceHook
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
 from airflow.sensors.base import BaseSensorOperator
@@ -142,9 +142,6 @@ class BigQueryDataTransferServiceTransferRunSensor(BaseSensorOperator):
         self.log.info("Status of %s run: %s", self.run_id, run.state)
 
         if run.state in (TransferState.FAILED, TransferState.CANCELLED):
-            # TODO: remove this if check when min_airflow_version is set to higher than 2.7.1
             message = f"Transfer {self.run_id} did not succeed"
-            if self.soft_fail:
-                raise AirflowSkipException(message)
             raise AirflowException(message)
         return run.state in self.expected_statuses

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

@@ -24,17 +24,17 @@ from datetime import datetime, timedelta
 from typing import TYPE_CHECKING, Any, Iterable, Sequence
 
 from dateutil import parser
-from deprecated import deprecated
 from google.cloud.orchestration.airflow.service_v1.types import ExecuteAirflowCommandResponse
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning, AirflowSkipException
+from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
 from airflow.providers.google.cloud.hooks.cloud_composer import CloudComposerHook
 from airflow.providers.google.cloud.triggers.cloud_composer import (
     CloudComposerDAGRunTrigger,
     CloudComposerExecutionTrigger,
 )
 from airflow.providers.google.common.consts import GOOGLE_DEFAULT_DEFERRABLE_METHOD_NAME
+from airflow.providers.google.common.deprecated import deprecated
 from airflow.sensors.base import BaseSensorOperator
 from airflow.utils.state import TaskInstanceState
 
@@ -43,12 +43,13 @@ if TYPE_CHECKING:
 
 
 @deprecated(
-    reason=(
-        "The `CloudComposerEnvironmentSensor` operator is deprecated. "
-        "You can achieve the same functionality "
-        "by using operators in deferrable or non-deferrable mode, since every operator for Cloud "
-        "Composer will wait for the operation to complete."
-    ),
+    planned_removal_date="November 01, 2024",
+    use_instead="CloudComposerCreateEnvironmentOperator, CloudComposerDeleteEnvironmentOperator, "
+    "CloudComposerUpdateEnvironmentOperator",
+    instructions="Please use CloudComposerCreateEnvironmentOperator, CloudComposerDeleteEnvironmentOperator "
+    "or CloudComposerUpdateEnvironmentOperator in deferrable or non-deferrable mode, "
+    "since since every operator gives user a possibility to wait (asynchronously or synchronously) "
+    "until the Operation is finished.",
     category=AirflowProviderDeprecationWarning,
 )
 class CloudComposerEnvironmentSensor(BaseSensorOperator):
@@ -118,15 +119,9 @@ class CloudComposerEnvironmentSensor(BaseSensorOperator):
             if event.get("operation_done"):
                 return event["operation_done"]
 
-            # TODO: remove this if check when min_airflow_version is set to higher than 2.7.1
-            if self.soft_fail:
-                raise AirflowSkipException(event["message"])
             raise AirflowException(event["message"])
 
-        # TODO: remove this if check when min_airflow_version is set to higher than 2.7.1
         message = "No event received in trigger callback"
-        if self.soft_fail:
-            raise AirflowSkipException(message)
         raise AirflowException(message)