Update retry param typing in PubSubAsyncHook (#36198)

josh-fell · web-flow · commit 8fbacb8a5fb4 · 2023-12-13T10:14:43.000+01:00
The `google-cloud-pubsub` library was [recently released](https://pypi.org/project/google-cloud-pubsub/2.19.0/) with a bug fix to update the `retry` parameter when using the SubscriberAsyncClient to AsyncRetry from Retry. Main builds were failing Mypy checks for this reason.
diff --git a/airflow/providers/google/cloud/hooks/pubsub.py b/airflow/providers/google/cloud/hooks/pubsub.py
@@ -49,6 +49,7 @@
 
 if TYPE_CHECKING:
     from google.api_core.retry import Retry
+    from google.api_core.retry_async import AsyncRetry
     from google.cloud.pubsub_v1.types import (
         DeadLetterPolicy,
         Duration,
@@ -611,7 +612,7 @@ async def acknowledge(
         project_id: str,
         ack_ids: list[str] | None = None,
         messages: list[ReceivedMessage] | None = None,
-        retry: Retry | _MethodDefault = DEFAULT,
+        retry: AsyncRetry | _MethodDefault = DEFAULT,
         timeout: float | None = None,
         metadata: Sequence[tuple[str, str]] = (),
     ) -> None:
@@ -665,7 +666,7 @@ async def pull(
         max_messages: int,
         project_id: str = PROVIDE_PROJECT_ID,
         return_immediately: bool = False,
-        retry: Retry | _MethodDefault = DEFAULT,
+        retry: AsyncRetry | _MethodDefault = DEFAULT,
         timeout: float | None = None,
         metadata: Sequence[tuple[str, str]] = (),
     ) -> list[ReceivedMessage]:
diff --git a/airflow/providers/google/provider.yaml b/airflow/providers/google/provider.yaml
@@ -115,7 +115,7 @@ dependencies:
   - google-cloud-monitoring>=2.14.1
   - google-cloud-orchestration-airflow>=1.10.0
   - google-cloud-os-login>=2.9.1
-  - google-cloud-pubsub>=2.15.0
+  - google-cloud-pubsub>=2.19.0
   - google-cloud-redis>=2.12.0
   - google-cloud-secret-manager>=2.16.0
   - google-cloud-spanner>=3.11.1
diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json
@@ -454,7 +454,7 @@
       "google-cloud-monitoring>=2.14.1",
       "google-cloud-orchestration-airflow>=1.10.0",
       "google-cloud-os-login>=2.9.1",
-      "google-cloud-pubsub>=2.15.0",
+      "google-cloud-pubsub>=2.19.0",
       "google-cloud-redis>=2.12.0",
       "google-cloud-run>=0.9.0",
       "google-cloud-secret-manager>=2.16.0",
