fix: fix AttributeError with AsyncRetry (#2072)

parthea · web-flow · commit dcddac803fc5 · 2024-07-26T19:32:10.000Z
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/pagers.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/pagers.py.j2
@@ -9,13 +9,14 @@
  #}
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import Any, AsyncIterator, Awaitable, Callable, Sequence, Tuple, Optional, Iterator, Union
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
-    OptionalAsyncRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
-    OptionalAsyncRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
 {% filter sort_lines %}
 {% for method in service.methods.values() | selectattr('paged_result_field') %}
diff --git a/gapic/templates/noxfile.py.j2 b/gapic/templates/noxfile.py.j2
@@ -183,8 +183,6 @@ def mypy(session):
         'types-protobuf'
     )
     session.install('.')
-    # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged
-    session.install("google-api-core>=2.19.1rc0")
     session.run(
         'mypy',
         '-p',
diff --git a/noxfile.py b/noxfile.py
@@ -273,8 +273,6 @@ def showcase_library(
             # Install the library without a constraints file.
             session.install("-e", tmp_dir)
 
-        # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged
-        session.install("google-api-core>=2.19.1rc0")
         yield tmp_dir
 
 
diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/pagers.py b/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/pagers.py
@@ -15,13 +15,14 @@
 #
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import Any, AsyncIterator, Awaitable, Callable, Sequence, Tuple, Optional, Iterator, Union
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
-    OptionalAsyncRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
-    OptionalAsyncRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
 from google.cloud.asset_v1.types import asset_service
 from google.cloud.asset_v1.types import assets
diff --git a/tests/integration/goldens/asset/noxfile.py b/tests/integration/goldens/asset/noxfile.py
@@ -194,8 +194,6 @@ def mypy(session):
         'types-protobuf'
     )
     session.install('.')
-    # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged
-    session.install("google-api-core>=2.19.1rc0")
     session.run(
         'mypy',
         '-p',
diff --git a/tests/integration/goldens/credentials/noxfile.py b/tests/integration/goldens/credentials/noxfile.py
@@ -194,8 +194,6 @@ def mypy(session):
         'types-protobuf'
     )
     session.install('.')
-    # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged
-    session.install("google-api-core>=2.19.1rc0")
     session.run(
         'mypy',
         '-p',
diff --git a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py
@@ -15,13 +15,14 @@
 #
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import Any, AsyncIterator, Awaitable, Callable, Sequence, Tuple, Optional, Iterator, Union
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
-    OptionalAsyncRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
-    OptionalAsyncRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
 from google.cloud.eventarc_v1.types import channel
 from google.cloud.eventarc_v1.types import channel_connection
diff --git a/tests/integration/goldens/eventarc/noxfile.py b/tests/integration/goldens/eventarc/noxfile.py
@@ -194,8 +194,6 @@ def mypy(session):
         'types-protobuf'
     )
     session.install('.')
-    # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged
-    session.install("google-api-core>=2.19.1rc0")
     session.run(
         'mypy',
         '-p',
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/pagers.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/pagers.py
@@ -15,13 +15,14 @@
 #
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import Any, AsyncIterator, Awaitable, Callable, Sequence, Tuple, Optional, Iterator, Union
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
-    OptionalAsyncRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
-    OptionalAsyncRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
 from google.cloud.logging_v2.types import logging_config
 
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/pagers.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/pagers.py
@@ -15,13 +15,14 @@
 #
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import Any, AsyncIterator, Awaitable, Callable, Sequence, Tuple, Optional, Iterator, Union
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
-    OptionalAsyncRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
-    OptionalAsyncRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
 from google.api import monitored_resource_pb2  # type: ignore
 from google.cloud.logging_v2.types import log_entry
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/pagers.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/pagers.py
@@ -15,13 +15,14 @@
 #
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import Any, AsyncIterator, Awaitable, Callable, Sequence, Tuple, Optional, Iterator, Union
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
-    OptionalAsyncRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
-    OptionalAsyncRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
 from google.cloud.logging_v2.types import logging_metrics
 
diff --git a/tests/integration/goldens/logging/noxfile.py b/tests/integration/goldens/logging/noxfile.py
@@ -194,8 +194,6 @@ def mypy(session):
         'types-protobuf'
     )
     session.install('.')
-    # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged
-    session.install("google-api-core>=2.19.1rc0")
     session.run(
         'mypy',
         '-p',
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/pagers.py b/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/pagers.py
@@ -15,13 +15,14 @@
 #
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import Any, AsyncIterator, Awaitable, Callable, Sequence, Tuple, Optional, Iterator, Union
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
-    OptionalAsyncRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
-    OptionalAsyncRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
+    OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
 from google.cloud.redis_v1.types import cloud_redis
 
diff --git a/tests/integration/goldens/redis/noxfile.py b/tests/integration/goldens/redis/noxfile.py
@@ -194,8 +194,6 @@ def mypy(session):
         'types-protobuf'
     )
     session.install('.')
-    # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged
-    session.install("google-api-core>=2.19.1rc0")
     session.run(
         'mypy',
         '-p',

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,6 @@ def mypy(session):`
`183`	`183`	`'types-protobuf'`
`184`	`184`	`)`
`185`	`185`	`session.install('.')`
`186`		`- # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged`
`187`		`- session.install("google-api-core>=2.19.1rc0")`
`188`	`186`	`session.run(`
`189`	`187`	`'mypy',`
`190`	`188`	`'-p',`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,6 @@ def mypy(session):`
`194`	`194`	`'types-protobuf'`
`195`	`195`	`)`
`196`	`196`	`session.install('.')`
`197`		`- # Remove once https://github.com/googleapis/python-api-core/pull/650 is merged`
`198`		`- session.install("google-api-core>=2.19.1rc0")`
`199`	`197`	`session.run(`
`200`	`198`	`'mypy',`
`201`	`199`	`'-p',`