apache-airflow-providers-google 10.18.0rc2__py3-none-any.whl → 10.19.0rc1__py3-none-any.whl

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

@@ -24,7 +24,6 @@ import warnings
 from functools import cached_property
 from typing import TYPE_CHECKING, Sequence, Tuple
 
-from deprecated import deprecated
 from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
 from google.cloud.automl_v1beta1 import (
     BatchPredictResult,
@@ -35,15 +34,15 @@ from google.cloud.automl_v1beta1 import (
     TableSpec,
 )
 
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.providers.google.cloud.hooks.automl import CloudAutoMLHook
 from airflow.providers.google.cloud.hooks.vertex_ai.prediction_service import PredictionServiceHook
-from airflow.providers.google.cloud.links.automl import (
-    AutoMLDatasetLink,
-    AutoMLDatasetListLink,
-    AutoMLModelLink,
-    AutoMLModelPredictLink,
-    AutoMLModelTrainLink,
+from airflow.providers.google.cloud.links.translate import (
+    TranslationDatasetListLink,
+    TranslationLegacyDatasetLink,
+    TranslationLegacyModelLink,
+    TranslationLegacyModelPredictLink,
+    TranslationLegacyModelTrainLink,
 )
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
 from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
@@ -119,8 +118,8 @@ class AutoMLTrainModelOperator(GoogleCloudBaseOperator):
         "impersonation_chain",
     )
     operator_extra_links = (
-        AutoMLModelTrainLink(),
-        AutoMLModelLink(),
+        TranslationLegacyModelTrainLink(),
+        TranslationLegacyModelLink(),
     )
 
     def __init__(
@@ -173,7 +172,9 @@ class AutoMLTrainModelOperator(GoogleCloudBaseOperator):
         )
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLModelTrainLink.persist(context=context, task_instance=self, project_id=project_id)
+            TranslationLegacyModelTrainLink.persist(
+                context=context, task_instance=self, project_id=project_id
+            )
         operation_result = hook.wait_for_operation(timeout=self.timeout, operation=operation)
         result = Model.to_dict(operation_result)
         model_id = hook.extract_object_id(result)
@@ -181,7 +182,7 @@ class AutoMLTrainModelOperator(GoogleCloudBaseOperator):
 
         self.xcom_push(context, key="model_id", value=model_id)
         if project_id:
-            AutoMLModelLink.persist(
+            TranslationLegacyModelLink.persist(
                 context=context,
                 task_instance=self,
                 dataset_id=self.model["dataset_id"] or "-",
@@ -195,6 +196,9 @@ class AutoMLPredictOperator(GoogleCloudBaseOperator):
     """
     Runs prediction operation on Google Cloud AutoML.
 
+    AutoMLPredictOperator for text, image, and video prediction has been deprecated.
+    Please use endpoint_id param instead of model_id param.
+
     .. seealso::
         For more information on how to use this operator, take a look at the guide:
         :ref:`howto/operator:AutoMLPredictOperator`
@@ -228,7 +232,7 @@ class AutoMLPredictOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLModelPredictLink(),)
+    operator_extra_links = (TranslationLegacyModelPredictLink(),)
 
     def __init__(
         self,
@@ -325,7 +329,7 @@ class AutoMLPredictOperator(GoogleCloudBaseOperator):
 
         project_id = self.project_id or hook.project_id
         if project_id and self.model_id:
-            AutoMLModelPredictLink.persist(
+            TranslationLegacyModelPredictLink.persist(
                 context=context,
                 task_instance=self,
                 model_id=self.model_id,
@@ -389,7 +393,7 @@ class AutoMLBatchPredictOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLModelPredictLink(),)
+    operator_extra_links = (TranslationLegacyModelPredictLink(),)
 
     def __init__(
         self,
@@ -426,7 +430,7 @@ class AutoMLBatchPredictOperator(GoogleCloudBaseOperator):
             gcp_conn_id=self.gcp_conn_id,
             impersonation_chain=self.impersonation_chain,
         )
-        model: Model = hook.get_model(
+        self.model: Model = hook.get_model(
             model_id=self.model_id,
             location=self.location,
             project_id=self.project_id,
@@ -435,7 +439,7 @@ class AutoMLBatchPredictOperator(GoogleCloudBaseOperator):
             metadata=self.metadata,
         )
 
-        if not hasattr(model, "translation_model_metadata"):
+        if not hasattr(self.model, "translation_model_metadata"):
             _raise_exception_for_deprecated_operator(
                 self.__class__.__name__,
                 [
@@ -462,7 +466,7 @@ class AutoMLBatchPredictOperator(GoogleCloudBaseOperator):
         self.log.info("Batch prediction is ready.")
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLModelPredictLink.persist(
+            TranslationLegacyModelPredictLink.persist(
                 context=context,
                 task_instance=self,
                 model_id=self.model_id,
@@ -511,7 +515,7 @@ class AutoMLCreateDatasetOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLDatasetLink(),)
+    operator_extra_links = (TranslationLegacyDatasetLink(),)
 
     def __init__(
         self,
@@ -560,7 +564,7 @@ class AutoMLCreateDatasetOperator(GoogleCloudBaseOperator):
         self.xcom_push(context, key="dataset_id", value=dataset_id)
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLDatasetLink.persist(
+            TranslationLegacyDatasetLink.persist(
                 context=context,
                 task_instance=self,
                 dataset_id=dataset_id,
@@ -611,7 +615,7 @@ class AutoMLImportDataOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLDatasetLink(),)
+    operator_extra_links = (TranslationLegacyDatasetLink(),)
 
     def __init__(
         self,
@@ -668,7 +672,7 @@ class AutoMLImportDataOperator(GoogleCloudBaseOperator):
         self.log.info("Import is completed")
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLDatasetLink.persist(
+            TranslationLegacyDatasetLink.persist(
                 context=context,
                 task_instance=self,
                 dataset_id=self.dataset_id,
@@ -680,6 +684,10 @@ class AutoMLTablesListColumnSpecsOperator(GoogleCloudBaseOperator):
     """
     Lists column specs in a table.
 
+    Operator AutoMLTablesListColumnSpecsOperator has been deprecated due to shutdown of
+    a legacy version of AutoML Tables on March 31, 2024. For additional information
+    see: https://cloud.google.com/automl-tables/docs/deprecations.
+
     .. seealso::
         For more information on how to use this operator, take a look at the guide:
         :ref:`howto/operator:AutoMLTablesListColumnSpecsOperator`
@@ -722,7 +730,7 @@ class AutoMLTablesListColumnSpecsOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLDatasetLink(),)
+    operator_extra_links = (TranslationLegacyDatasetLink(),)
 
     def __init__(
         self,
@@ -754,6 +762,11 @@ class AutoMLTablesListColumnSpecsOperator(GoogleCloudBaseOperator):
         self.retry = retry
         self.gcp_conn_id = gcp_conn_id
         self.impersonation_chain = impersonation_chain
+        raise AirflowException(
+            "Operator AutoMLTablesListColumnSpecsOperator has been deprecated due to shutdown of "
+            "a legacy version of AutoML Tables on March 31, 2024. "
+            "For additional information see: https://cloud.google.com/automl-tables/docs/deprecations."
+        )
 
     def execute(self, context: Context):
         hook = CloudAutoMLHook(
@@ -777,7 +790,7 @@ class AutoMLTablesListColumnSpecsOperator(GoogleCloudBaseOperator):
         self.log.info("Columns specs obtained.")
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLDatasetLink.persist(
+            TranslationLegacyDatasetLink.persist(
                 context=context,
                 task_instance=self,
                 dataset_id=self.dataset_id,
@@ -786,20 +799,14 @@ class AutoMLTablesListColumnSpecsOperator(GoogleCloudBaseOperator):
         return result
 
 
-@deprecated(
-    reason=(
-        "Class `AutoMLTablesUpdateDatasetOperator` has been deprecated and no longer available. "
-        "Please use `UpdateDatasetOperator` instead"
-    ),
-    category=AirflowProviderDeprecationWarning,
-    action="error",
-)
 class AutoMLTablesUpdateDatasetOperator(GoogleCloudBaseOperator):
     """
     Updates a dataset.
 
-    AutoMLTablesUpdateDatasetOperator has been deprecated and no longer available. Please use
-    :class:`airflow.providers.google.cloud.operators.vertex_ai.dataset.UpdateDatasetOperator`
+    Operator AutoMLTablesUpdateDatasetOperator has been deprecated due to shutdown of
+    a legacy version of AutoML Tables on March 31, 2024. For additional information
+    see: https://cloud.google.com/automl-tables/docs/deprecations.
+    Please use :class:`airflow.providers.google.cloud.operators.vertex_ai.dataset.UpdateDatasetOperator`
     instead.
 
     .. seealso::
@@ -834,7 +841,7 @@ class AutoMLTablesUpdateDatasetOperator(GoogleCloudBaseOperator):
         "location",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLDatasetLink(),)
+    operator_extra_links = (TranslationLegacyDatasetLink(),)
 
     def __init__(
         self,
@@ -859,6 +866,12 @@ class AutoMLTablesUpdateDatasetOperator(GoogleCloudBaseOperator):
         self.retry = retry
         self.gcp_conn_id = gcp_conn_id
         self.impersonation_chain = impersonation_chain
+        raise AirflowException(
+            "Operator AutoMLTablesUpdateDatasetOperator has been deprecated due to shutdown of "
+            "a legacy version of AutoML Tables on March 31, 2024. "
+            "For additional information see: https://cloud.google.com/automl-tables/docs/deprecations. "
+            "Please use UpdateDatasetOperator from Vertex AI instead."
+        )
 
     def execute(self, context: Context):
         hook = CloudAutoMLHook(
@@ -876,7 +889,7 @@ class AutoMLTablesUpdateDatasetOperator(GoogleCloudBaseOperator):
         self.log.info("Dataset updated.")
         project_id = hook.project_id
         if project_id:
-            AutoMLDatasetLink.persist(
+            TranslationLegacyDatasetLink.persist(
                 context=context,
                 task_instance=self,
                 dataset_id=hook.extract_object_id(self.dataset),
@@ -924,7 +937,7 @@ class AutoMLGetModelOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLModelLink(),)
+    operator_extra_links = (TranslationLegacyModelLink(),)
 
     def __init__(
         self,
@@ -968,7 +981,7 @@ class AutoMLGetModelOperator(GoogleCloudBaseOperator):
         model = Model.to_dict(result)
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLModelLink.persist(
+            TranslationLegacyModelLink.persist(
                 context=context,
                 task_instance=self,
                 dataset_id=model["dataset_id"],
@@ -1069,14 +1082,6 @@ class AutoMLDeleteModelOperator(GoogleCloudBaseOperator):
         self.log.info("Deletion is completed")
 
 
-@deprecated(
-    reason=(
-        "Class `AutoMLDeployModelOperator` has been deprecated and no longer available. Please use "
-        "`DeployModelOperator` instead"
-    ),
-    category=AirflowProviderDeprecationWarning,
-    action="error",
-)
 class AutoMLDeployModelOperator(GoogleCloudBaseOperator):
     """
     Deploys a model; if a model is already deployed, deploying it with the same parameters has no effect.
@@ -1087,8 +1092,10 @@ class AutoMLDeployModelOperator(GoogleCloudBaseOperator):
     Only applicable for Text Classification, Image Object Detection and Tables; all other
     domains manage deployment automatically.
 
-    AutoMLDeployModelOperator has been deprecated and no longer available. Please use
-    :class:`airflow.providers.google.cloud.operators.vertex_ai.endpoint_service.DeployModelOperator`
+    Operator AutoMLDeployModelOperator has been deprecated due to shutdown of a legacy version
+    of AutoML Natural Language, Vision, Video Intelligence on March 31, 2024.
+    For additional information see: https://cloud.google.com/vision/automl/docs/deprecations .
+    Please use :class:`airflow.providers.google.cloud.operators.vertex_ai.endpoint_service.DeployModelOperator`
     instead.
 
     .. seealso::
@@ -1151,24 +1158,20 @@ class AutoMLDeployModelOperator(GoogleCloudBaseOperator):
         self.retry = retry
         self.gcp_conn_id = gcp_conn_id
         self.impersonation_chain = impersonation_chain
+        raise AirflowException(
+            "Operator AutoMLDeployModelOperator has been deprecated due to shutdown of "
+            "a legacy version of AutoML AutoML Natural Language, Vision, Video Intelligence "
+            "on March 31, 2024. "
+            "For additional information see: https://cloud.google.com/vision/automl/docs/deprecations. "
+            "Please use DeployModelOperator from Vertex AI instead."
+        )
 
     def execute(self, context: Context):
         hook = CloudAutoMLHook(
             gcp_conn_id=self.gcp_conn_id,
             impersonation_chain=self.impersonation_chain,
         )
-        model = hook.get_model(
-            model_id=self.model_id,
-            location=self.location,
-            project_id=self.project_id,
-            retry=self.retry,
-            timeout=self.timeout,
-            metadata=self.metadata,
-        )
-        if not hasattr(model, "translation_model_metadata"):
-            _raise_exception_for_deprecated_operator(self.__class__.__name__, "DeployModelOperator")
         self.log.info("Deploying model_id %s", self.model_id)
-
         operation = hook.deploy_model(
             model_id=self.model_id,
             location=self.location,
@@ -1186,6 +1189,10 @@ class AutoMLTablesListTableSpecsOperator(GoogleCloudBaseOperator):
     """
     Lists table specs in a dataset.
 
+    Operator AutoMLTablesListTableSpecsOperator has been deprecated due to shutdown of
+    a legacy version of AutoML Tables on March 31, 2024. For additional information
+    see: https://cloud.google.com/automl-tables/docs/deprecations.
+
     .. seealso::
         For more information on how to use this operator, take a look at the guide:
         :ref:`howto/operator:AutoMLTablesListTableSpecsOperator`
@@ -1223,7 +1230,7 @@ class AutoMLTablesListTableSpecsOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLDatasetLink(),)
+    operator_extra_links = (TranslationLegacyDatasetLink(),)
 
     def __init__(
         self,
@@ -1251,6 +1258,11 @@ class AutoMLTablesListTableSpecsOperator(GoogleCloudBaseOperator):
         self.retry = retry
         self.gcp_conn_id = gcp_conn_id
         self.impersonation_chain = impersonation_chain
+        raise AirflowException(
+            "Operator AutoMLTablesListTableSpecsOperator has been deprecated due to shutdown of "
+            "a legacy version of AutoML Tables on March 31, 2024. "
+            "For additional information see: https://cloud.google.com/automl-tables/docs/deprecations. "
+        )
 
     def execute(self, context: Context):
         hook = CloudAutoMLHook(
@@ -1273,7 +1285,7 @@ class AutoMLTablesListTableSpecsOperator(GoogleCloudBaseOperator):
         self.log.info("Table specs obtained.")
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLDatasetLink.persist(
+            TranslationLegacyDatasetLink.persist(
                 context=context,
                 task_instance=self,
                 dataset_id=self.dataset_id,
@@ -1318,7 +1330,7 @@ class AutoMLListDatasetOperator(GoogleCloudBaseOperator):
         "project_id",
         "impersonation_chain",
     )
-    operator_extra_links = (AutoMLDatasetListLink(),)
+    operator_extra_links = (TranslationDatasetListLink(),)
 
     def __init__(
         self,
@@ -1373,7 +1385,7 @@ class AutoMLListDatasetOperator(GoogleCloudBaseOperator):
         )
         project_id = self.project_id or hook.project_id
         if project_id:
-            AutoMLDatasetListLink.persist(context=context, task_instance=self, project_id=project_id)
+            TranslationDatasetListLink.persist(context=context, task_instance=self, project_id=project_id)
         return result
 
 

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

@@ -47,6 +47,7 @@ from airflow.providers.common.sql.operators.sql import (
 from airflow.providers.google.cloud.hooks.bigquery import BigQueryHook, BigQueryJob
 from airflow.providers.google.cloud.hooks.gcs import GCSHook, _parse_gcs_url
 from airflow.providers.google.cloud.links.bigquery import BigQueryDatasetLink, BigQueryTableLink
+from airflow.providers.google.cloud.openlineage.utils import _BigQueryOpenLineageMixin
 from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
 from airflow.providers.google.cloud.triggers.bigquery import (
     BigQueryCheckTrigger,
@@ -141,68 +142,6 @@ class _BigQueryDbHookMixin:
         )
 
 
-class _BigQueryOpenLineageMixin:
-    def get_openlineage_facets_on_complete(self, task_instance):
-        """
-        Retrieve OpenLineage data for a COMPLETE BigQuery job.
-
-        This method retrieves statistics for the specified job_ids using the BigQueryDatasetsProvider.
-        It calls BigQuery API, retrieving input and output dataset info from it, as well as run-level
-        usage statistics.
-
-        Run facets should contain:
-            - ExternalQueryRunFacet
-            - BigQueryJobRunFacet
-
-        Job facets should contain:
-            - SqlJobFacet if operator has self.sql
-
-        Input datasets should contain facets:
-            - DataSourceDatasetFacet
-            - SchemaDatasetFacet
-
-        Output datasets should contain facets:
-            - DataSourceDatasetFacet
-            - SchemaDatasetFacet
-            - OutputStatisticsOutputDatasetFacet
-        """
-        from openlineage.client.facet import SqlJobFacet
-        from openlineage.common.provider.bigquery import BigQueryDatasetsProvider
-
-        from airflow.providers.openlineage.extractors import OperatorLineage
-        from airflow.providers.openlineage.utils.utils import normalize_sql
-
-        if not self.job_id:
-            return OperatorLineage()
-
-        client = self.hook.get_client(project_id=self.hook.project_id)
-        job_ids = self.job_id
-        if isinstance(self.job_id, str):
-            job_ids = [self.job_id]
-        inputs, outputs, run_facets = {}, {}, {}
-        for job_id in job_ids:
-            stats = BigQueryDatasetsProvider(client=client).get_facets(job_id=job_id)
-            for input in stats.inputs:
-                input = input.to_openlineage_dataset()
-                inputs[input.name] = input
-            if stats.output:
-                output = stats.output.to_openlineage_dataset()
-                outputs[output.name] = output
-            for key, value in stats.run_facets.items():
-                run_facets[key] = value
-
-        job_facets = {}
-        if hasattr(self, "sql"):
-            job_facets["sql"] = SqlJobFacet(query=normalize_sql(self.sql))
-
-        return OperatorLineage(
-            inputs=list(inputs.values()),
-            outputs=list(outputs.values()),
-            run_facets=run_facets,
-            job_facets=job_facets,
-        )
-
-
 class _BigQueryOperatorsEncryptionConfigurationMixin:
     """A class to handle the configuration for BigQueryHook.insert_job method."""
 

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

@@ -176,6 +176,7 @@ class CreateAutoMLForecastingTrainingJobOperator(AutoMLTrainingJobBaseOperator):
             gcp_conn_id=self.gcp_conn_id,
             impersonation_chain=self.impersonation_chain,
         )
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
         model, training_id = self.hook.create_auto_ml_forecasting_training_job(
             project_id=self.project_id,
             region=self.region,
@@ -283,6 +284,7 @@ class CreateAutoMLImageTrainingJobOperator(AutoMLTrainingJobBaseOperator):
             gcp_conn_id=self.gcp_conn_id,
             impersonation_chain=self.impersonation_chain,
         )
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
         model, training_id = self.hook.create_auto_ml_image_training_job(
             project_id=self.project_id,
             region=self.region,
@@ -391,6 +393,7 @@ class CreateAutoMLTabularTrainingJobOperator(AutoMLTrainingJobBaseOperator):
             impersonation_chain=self.impersonation_chain,
         )
         credentials, _ = self.hook.get_credentials_and_project_id()
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
         model, training_id = self.hook.create_auto_ml_tabular_training_job(
             project_id=self.project_id,
             region=self.region,
@@ -485,6 +488,7 @@ class CreateAutoMLTextTrainingJobOperator(AutoMLTrainingJobBaseOperator):
             gcp_conn_id=self.gcp_conn_id,
             impersonation_chain=self.impersonation_chain,
         )
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
         model, training_id = self.hook.create_auto_ml_text_training_job(
             project_id=self.project_id,
             region=self.region,
@@ -561,6 +565,7 @@ class CreateAutoMLVideoTrainingJobOperator(AutoMLTrainingJobBaseOperator):
             gcp_conn_id=self.gcp_conn_id,
             impersonation_chain=self.impersonation_chain,
         )
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
         model, training_id = self.hook.create_auto_ml_video_training_job(
             project_id=self.project_id,
             region=self.region,

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

@@ -493,6 +493,8 @@ class CreateCustomContainerTrainingJobOperator(CustomTrainingJobBaseOperator):
     def execute(self, context: Context):
         super().execute(context)
 
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
+
         if self.deferrable:
             self.invoke_defer(context=context)
 
@@ -966,6 +968,8 @@ class CreateCustomPythonPackageTrainingJobOperator(CustomTrainingJobBaseOperator
     def execute(self, context: Context):
         super().execute(context)
 
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
+
         if self.deferrable:
             self.invoke_defer(context=context)
 
@@ -1446,6 +1450,8 @@ class CreateCustomTrainingJobOperator(CustomTrainingJobBaseOperator):
     def execute(self, context: Context):
         super().execute(context)
 
+        self.parent_model = self.parent_model.split("@")[0] if self.parent_model else None
+
         if self.deferrable:
             self.invoke_defer(context=context)
 

airflow/providers/google/cloud/transfers/azure_fileshare_to_gcs.py

@@ -43,8 +43,10 @@ class AzureFileShareToGCSOperator(BaseOperator):
     Does not include subdirectories.  May be filtered by prefix.
 
     :param share_name: The Azure FileShare share where to find the objects. (templated)
-    :param directory_name: (Optional) Path to Azure FileShare directory which content is to be transferred.
+    :param directory_name: (Deprecated) Path to Azure FileShare directory which content is to be transferred.
         Defaults to root directory (templated)
+    :param directory_path: (Optional) Path to Azure FileShare directory which content is to be transferred.
+        Defaults to root directory. Use this instead of ``directory_name``. (templated)
     :param prefix: Prefix string which filters objects whose name begin with
         such prefix. (templated)
     :param azure_fileshare_conn_id: The source WASB connection
@@ -63,13 +65,14 @@ class AzureFileShareToGCSOperator(BaseOperator):
         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).
 
-    Note that ``share_name``, ``directory_name``, ``prefix``, ``delimiter`` and ``dest_gcs`` are
+    Note that ``share_name``, ``directory_path``, ``prefix``, and ``dest_gcs`` are
     templated, so you can use variables in them if you wish.
     """
 
     template_fields: Sequence[str] = (
         "share_name",
         "directory_name",
+        "directory_path",
         "prefix",
         "dest_gcs",
     )
@@ -94,8 +97,8 @@ class AzureFileShareToGCSOperator(BaseOperator):
         self.share_name = share_name
         self.directory_path = directory_path
         self.directory_name = directory_name
-        if self.directory_path is None:
-            self.directory_path = directory_name
+        if self.directory_path is None and self.directory_name is not None:
+            self.directory_path = self.directory_name
             warnings.warn(
                 "Use 'directory_path' instead of 'directory_name'.",
                 AirflowProviderDeprecationWarning,

airflow/providers/google/cloud/transfers/bigquery_to_gcs.py

@@ -296,7 +296,7 @@ class BigQueryToGCSOperator(BaseOperator):
         from openlineage.client.run import Dataset
 
         from airflow.providers.google.cloud.hooks.gcs import _parse_gcs_url
-        from airflow.providers.google.cloud.utils.openlineage import (
+        from airflow.providers.google.cloud.openlineage.utils import (
             get_facets_from_bq_table,
             get_identity_column_lineage_facet,
         )

airflow/providers/google/cloud/transfers/gcs_to_bigquery.py

@@ -750,7 +750,7 @@ class GCSToBigQueryOperator(BaseOperator):
         )
         from openlineage.client.run import Dataset
 
-        from airflow.providers.google.cloud.utils.openlineage import (
+        from airflow.providers.google.cloud.openlineage.utils import (
             get_facets_from_bq_table,
             get_identity_column_lineage_facet,
         )

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

@@ -97,22 +97,19 @@ class PubsubPullTrigger(BaseTrigger):
 
     async def run(self) -> AsyncIterator[TriggerEvent]:  # type: ignore[override]
         try:
-            pulled_messages = None
             while True:
-                if pulled_messages:
+                if pulled_messages := await self.hook.pull(
+                    project_id=self.project_id,
+                    subscription=self.subscription,
+                    max_messages=self.max_messages,
+                    return_immediately=True,
+                ):
                     if self.ack_messages:
                         await self.message_acknowledgement(pulled_messages)
                     yield TriggerEvent({"status": "success", "message": pulled_messages})
                     return
-                else:
-                    pulled_messages = await self.hook.pull(
-                        project_id=self.project_id,
-                        subscription=self.subscription,
-                        max_messages=self.max_messages,
-                        return_immediately=True,
-                    )
-                    self.log.info("Sleeping for %s seconds.", self.poke_interval)
-                    await asyncio.sleep(self.poke_interval)
+                self.log.info("Sleeping for %s seconds.", self.poke_interval)
+                await asyncio.sleep(self.poke_interval)
         except Exception as e:
             yield TriggerEvent({"status": "error", "message": str(e)})
             return