Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: add async_rest extra for async rest dependencies #2195

Merged
merged 17 commits into from
Sep 30, 2024
Merged

chore: add async_rest extra for async rest dependencies #2195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a6c1789
feat: add async rest option in setup
ohmayr Sep 24, 2024
17a1c5f
address PR feedback
ohmayr Sep 25, 2024
a468255
update exception statements
ohmayr Sep 25, 2024
3ec9135
reorder imports
ohmayr Sep 25, 2024
df3ff6f
minor fix in import statement
ohmayr Sep 25, 2024
7c4679e
address PR feedback
ohmayr Sep 27, 2024
4247f57
update constraints for async rest
ohmayr Sep 27, 2024
50dc716
update noxfile
ohmayr Sep 27, 2024
a75bfce
add whitespace
ohmayr Sep 27, 2024
fcc4982
remove constraints file
ohmayr Sep 27, 2024
1160ace
revert noxfile
ohmayr Sep 27, 2024
1214787
use extra to install the required deps
ohmayr Sep 27, 2024
4607716
update noxfile for gapics
ohmayr Sep 27, 2024
56e9f05
avoid conflict with 3.7 constraints
ohmayr Sep 27, 2024
715926a
update noxfile
ohmayr Sep 27, 2024
6533c77
address PR feedback
ohmayr Sep 27, 2024
9a370b5
address PR feedback
ohmayr Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions .../templates/%namespace/%name_%version/%sub/services/%service/transports/rest_asyncio.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,23 @@


import google.auth
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2187): Add an `async_rest` extra for GAPICs and update the error message to include that the extra needs to be installed. #}
try:
import aiohttp # type: ignore
from google.auth.aio.transport.sessions import AsyncAuthorizedSession # type: ignore
from google.api_core import rest_streaming_async # type: ignore
{# NOTE: `pragma: NO COVER` is needed since the coverage for presubmits isn't combined. #}
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2200): Add coverage for ImportError. #}
except ImportError as e: # pragma: NO COVER
{# TODO(https://github.com/googleapis/google-auth-library-python/pull/1577): Update the version of google-auth once the linked PR is merged. #}
raise ImportError("async rest transport requires google-auth >= 2.35.0 with aiohttp extra. Install google-auth with the aiohttp extra using `pip install google-auth[aiohttp]==2.35.0`.") from e
raise ImportError("`rest_asyncio` transport requires the library to be installed with the `async_rest` extra. Install the library with the `async_rest` extra using `pip install {{ api.naming.warehouse_package_name }}[async_rest]`") from e

from google.auth.aio import credentials as ga_credentials_async # type: ignore

from google.api_core import exceptions as core_exceptions
from google.api_core import gapic_v1
from google.api_core import retry_async as retries
from google.api_core import rest_helpers
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2137): raise an import error if an older version of google.api.core is installed. #}
from google.api_core import rest_streaming_async # type: ignore

try:
from google.api_core import rest_streaming_async # type: ignore
HAS_ASYNC_REST_SUPPORT_IN_CORE = True
{# NOTE: `pragma: NO COVER` is needed since the coverage for presubmits isn't combined. #}
except ImportError as e: # pragma: NO COVER
raise ImportError("async rest transport requires google-api-core >= 2.20.0. Install google-api-core using `pip install google-api-core==2.35.0`.") from e

from google.protobuf import json_format
{% if service.has_lro %}
Expand Down
1 change: 1 addition & 0 deletions gapic/templates/noxfile.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def unit(session, protobuf_implementation):
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
},
)
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2201) Add a `unit_rest_async` nox session to run tests with [async_rest] extra installed. #}

@nox.session(python=ALL_PYTHON[-1])
@nox.parametrize(
Expand Down
11 changes: 11 additions & 0 deletions gapic/templates/setup.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2121): Remove the following variable (and the condition later in this file) for async rest transport once support for it is GA. #}
{% set rest_async_io_enabled = api.all_library_settings[api.naming.proto_package].python_settings.experimental_features.rest_async_io_enabled %}
{% extends '_base.py.j2' %}
{% from '_pypi_packages.j2' import pypi_packages %}
{% block content %}
Expand Down Expand Up @@ -46,6 +48,14 @@ dependencies = [
{% endif %}
{% endfor %}
]
extras = {
{% if rest_async_io_enabled %}
"async_rest": [
"google-api-core[grpc] >= 2.20.0, < 3.0.0dev",
"google-auth[aiohttp] >= 2.35.0, <3.0.0dev"
],
{% endif %}
}
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/{{ api.naming.warehouse_package_name }}"
package_root = os.path.abspath(os.path.dirname(__file__))
Expand Down Expand Up @@ -88,6 +98,7 @@ setuptools.setup(
packages=packages,
python_requires=">=3.7",
install_requires=dependencies,
extras_require=extras,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if this wasn't there before, why weren't some tests failing? This would suggest a failure in our tests. At the GAPIC level, the test should silently pass if the GAPIC was generated without REST transport or installed without the extra. But at the generator level, we want to ensure that the tests with the extras pass, so how can we be notified if we run a test suite where we expect the extra and the associated tests, but it turns out the extra wasn't installed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests weren't failing because we're not using the async_rest extra to install the dependencies. We've explicitly defined each required dependency within the constraints file.

include_package_data=True,
zip_safe=False,
)
Expand Down
20 changes: 4 additions & 16 deletions gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ from proto.marshal.rules import wrappers
{% if rest_async_io_enabled %}
try:
import aiohttp # type: ignore
HAS_AIOHTTP_INSTALLED = True
from google.auth.aio.transport.sessions import AsyncAuthorizedSession
from google.api_core import rest_streaming_async
HAS_ASYNC_REST_EXTRA = True
{# NOTE: `pragma: NO COVER` is needed since the coverage for presubmits isn't combined. #}
except ImportError: # pragma: NO COVER
HAS_AIOHTTP_INSTALLED = False
HAS_ASYNC_REST_EXTRA = False
{% endif %}{# if rest_async_io_enabled #}
from requests import Response
from requests import Request, PreparedRequest
Expand All @@ -46,24 +48,10 @@ from google.protobuf import json_format

try:
from google.auth.aio import credentials as ga_credentials_async
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2121): Remove this condition when async rest is GA. #}
{% if rest_async_io_enabled %}
from google.auth.aio.transport.sessions import AsyncAuthorizedSession
{% endif %}
HAS_GOOGLE_AUTH_AIO = True
{# NOTE: `pragma: NO COVER` is needed since the coverage for presubmits isn't combined. #}
except ImportError: # pragma: NO COVER
HAS_GOOGLE_AUTH_AIO = False
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2121): Remove this condition when async rest is GA. #}
{% if rest_async_io_enabled %}

try:
from google.api_core import rest_streaming_async
HAS_ASYNC_REST_SUPPORT_IN_CORE = True
{# NOTE: `pragma: NO COVER` is needed since the coverage for presubmits isn't combined. #}
except ImportError: # pragma: NO COVER
HAS_ASYNC_REST_SUPPORT_IN_CORE = False
{% endif %}

{# Import the service itself as well as every proto module that it imports. #}
{% filter sort_lines %}
Expand Down
84 changes: 20 additions & 64 deletions gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,12 +1761,8 @@ def test_{{ method_name }}_rest_no_http_options():
{% set transport_name = get_transport_name(transport, is_async) %}
def test_transport_kind_{{ transport_name }}():
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")
if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
transport = {{ get_client(service, is_async) }}.get_transport_class("{{ transport_name }}")(
credentials={{get_credentials(is_async)}}
Expand All @@ -1787,12 +1783,8 @@ def test_transport_kind_{{ transport_name }}():
{{async_decorator}}
{{async_prefix}}def test_transport_close_{{transport_name}}():
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")
if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
client = {{ get_client(service, is_async) }}(
credentials={{get_credentials(is_async)}},
Expand All @@ -1808,12 +1800,8 @@ def test_transport_kind_{{ transport_name }}():
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2121): Remove / Update this test macro when async rest is GA. #}
{% macro async_rest_unsupported_params_test(service) %}
def test_unsupported_parameter_rest_asyncio():
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")
if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
options = client_options.ClientOptions(quota_project_id="octopus")
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2137): Remove `type: ignore` once we add a version check for google-api-core. #}
with pytest.raises(core_exceptions.AsyncRestUnsupportedParameterError, match="google.api_core.client_options.ClientOptions.quota_project_id") as exc: # type: ignore
Expand Down Expand Up @@ -1903,12 +1891,8 @@ def test_unsupported_parameter_rest_asyncio():
{{async_decorator}}
{{async_prefix}}def test_{{ method_name }}_{{transport_name}}_error():
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")
if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}

client = {{ get_client(service, is_async) }}(
Expand All @@ -1934,12 +1918,8 @@ def test_unsupported_parameter_rest_asyncio():
{% set transport_name = get_transport_name(transport, is_async) %}
def test_initialize_client_w_{{transport_name}}():
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")
if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
client = {{ get_client(service, is_async) }}(
credentials={{get_credentials(is_async)}},
Expand All @@ -1966,12 +1946,8 @@ def test_initialize_client_w_{{transport_name}}():
raise NotImplementedError("gRPC is currently not supported for this test case.")
{% else %}{# 'rest' in transport #}
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")
if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
client = {{ get_client(service, is_async) }}(
credentials={{get_credentials(is_async)}},
Expand Down Expand Up @@ -2016,13 +1992,8 @@ def test_initialize_client_w_{{transport_name}}():
raise NotImplementedError("gRPC is currently not supported for this test case.")
{% else %}{# 'rest' in transport #}
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")

if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
client = {{ get_client(service, is_async) }}(
credentials={{get_credentials(is_async)}},
Expand Down Expand Up @@ -2086,13 +2057,8 @@ def test_initialize_client_w_{{transport_name}}():
raise NotImplementedError("gRPC is currently not supported for this test case.")
{% else %}{# 'rest' in transport #}
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")

if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
client = {{ get_client(service, is_async) }}(
credentials={{get_credentials(is_async)}},
Expand Down Expand Up @@ -2314,13 +2280,8 @@ def test_initialize_client_w_{{transport_name}}():
raise NotImplementedError("gRPC is currently not supported for this test case.")
{% else %}{# 'rest' in transport #}
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")

if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
client = {{ get_client(service, is_async) }}(
credentials={{get_credentials(is_async)}},
Expand Down Expand Up @@ -2422,13 +2383,8 @@ def test_initialize_client_w_{{transport_name}}():
raise NotImplementedError("gRPC is currently not supported for this test case.")
{% else %}{# 'rest' in transport #}
{% if transport_name == 'rest_asyncio' %}
if not HAS_GOOGLE_AUTH_AIO:
pytest.skip("google-auth >= 2.35.0 is required for async rest transport.")
elif not HAS_AIOHTTP_INSTALLED:
pytest.skip("aiohttp is required for async rest transport.")
elif not HAS_ASYNC_REST_SUPPORT_IN_CORE:
pytest.skip("google-api-core >= 2.20.0 is required for async rest transport.")

if not HAS_ASYNC_REST_EXTRA:
pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
{% endif %}
transport = transports.{{async_method_prefix}}{{ service.name }}RestTransport(
credentials={{get_credentials(is_async)}},
Expand Down
15 changes: 10 additions & 5 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,16 @@ def showcase_library(
f"{tmp_dir}/testing/constraints-{session.python}.txt"
)
# Install the library with a constraints file.
session.install("-e", tmp_dir, "-r", constraints_path)
if session.python == "3.7":
session.install("-e", tmp_dir, "-r", constraints_path)
if rest_async_io_enabled:
# NOTE: We re-install `google-api-core` and `google-auth` to override the respective
# versions for each specified in constraints-3.7.txt. This is needed because async REST
# is not supported with the minimum version of `google-api-core` and `google-auth`.
session.install('--no-cache-dir', '--force-reinstall', "google-api-core==2.20.0")
session.install('--no-cache-dir', '--force-reinstall', "google-auth[aiohttp]==2.35.0")
else:
session.install("-e", tmp_dir + ("[async_rest]" if rest_async_io_enabled else ""), "-r", constraints_path)
ohmayr marked this conversation as resolved.
Show resolved Hide resolved
else:
# The ads templates do not have constraints files.
# See https://github.com/googleapis/gapic-generator-python/issues/1788
Expand Down Expand Up @@ -363,8 +372,6 @@ def showcase_w_rest_async(
ignore_path = test_directory / ignore_file
pytest_command.extend(["--ignore", str(ignore_path)])

# Note: google-auth is re-installed here with aiohttp option to override the version installed in constraints.
session.install('--no-cache-dir', '--force-reinstall', "google-auth[aiohttp]")
session.run(
*pytest_command,
env=env,
Expand Down Expand Up @@ -485,8 +492,6 @@ def showcase_unit_w_rest_async(
"""Run the generated unit tests with async rest transport against the Showcase library."""
with showcase_library(session, templates=templates, other_opts=other_opts, rest_async_io_enabled=True) as lib:
session.chdir(lib)
# Note: google-auth is re-installed here with aiohttp option to override the version installed in constraints.
session.install('--no-cache-dir', '--force-reinstall', "google-auth[aiohttp]")
run_showcase_unit_tests(session, rest_async_io_enabled=True)


Expand Down
3 changes: 3 additions & 0 deletions tests/integration/goldens/asset/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
"google-cloud-os-config >= 1.0.0, <2.0.0dev",
"grpc-google-iam-v1 >= 0.12.4, <1.0.0dev",
]
extras = {
}
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset"

package_root = os.path.abspath(os.path.dirname(__file__))
Expand Down Expand Up @@ -91,6 +93,7 @@
packages=packages,
python_requires=">=3.7",
install_requires=dependencies,
extras_require=extras,
include_package_data=True,
zip_safe=False,
)
3 changes: 3 additions & 0 deletions tests/integration/goldens/credentials/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
"proto-plus >= 1.22.3, <2.0.0dev",
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
]
extras = {
}
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-iam-credentials"

package_root = os.path.abspath(os.path.dirname(__file__))
Expand Down Expand Up @@ -88,6 +90,7 @@
packages=packages,
python_requires=">=3.7",
install_requires=dependencies,
extras_require=extras,
include_package_data=True,
zip_safe=False,
)
3 changes: 3 additions & 0 deletions tests/integration/goldens/eventarc/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"grpc-google-iam-v1 >= 0.12.4, <1.0.0dev",
]
extras = {
}
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-eventarc"

package_root = os.path.abspath(os.path.dirname(__file__))
Expand Down Expand Up @@ -89,6 +91,7 @@
packages=packages,
python_requires=">=3.7",
install_requires=dependencies,
extras_require=extras,
include_package_data=True,
zip_safe=False,
)
3 changes: 3 additions & 0 deletions tests/integration/goldens/logging/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
"proto-plus >= 1.22.3, <2.0.0dev",
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
]
extras = {
}
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-logging"

package_root = os.path.abspath(os.path.dirname(__file__))
Expand Down Expand Up @@ -88,6 +90,7 @@
packages=packages,
python_requires=">=3.7",
install_requires=dependencies,
extras_require=extras,
include_package_data=True,
zip_safe=False,
)
8 changes: 2 additions & 6 deletions ...ation/goldens/redis/google/cloud/redis_v1/services/cloud_redis/transports/rest_asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
try:
import aiohttp # type: ignore
from google.auth.aio.transport.sessions import AsyncAuthorizedSession # type: ignore
from google.api_core import rest_streaming_async # type: ignore
except ImportError as e: # pragma: NO COVER
raise ImportError("async rest transport requires google-auth >= 2.35.0 with aiohttp extra. Install google-auth with the aiohttp extra using `pip install google-auth[aiohttp]==2.35.0`.") from e
raise ImportError("`rest_asyncio` transport requires the library to be installed with the `async_rest` extra. Install the library with the `async_rest` extra using `pip install google-cloud-redis[async_rest]`") from e

from google.auth.aio import credentials as ga_credentials_async # type: ignore

Expand All @@ -29,11 +30,6 @@
from google.api_core import rest_helpers
from google.api_core import rest_streaming_async # type: ignore

try:
from google.api_core import rest_streaming_async # type: ignore
HAS_ASYNC_REST_SUPPORT_IN_CORE = True
except ImportError as e: # pragma: NO COVER
raise ImportError("async rest transport requires google-api-core >= 2.20.0. Install google-api-core using `pip install google-api-core==2.35.0`.") from e

from google.protobuf import json_format
from google.api_core import operations_v1
Expand Down
Loading