Skip to content
This repository was archived by the owner on Feb 23, 2026. It is now read-only.

chore: fallback to unary_unary when wrapping async callables #653

Merged
parthea merged 3 commits into from
Jun 4, 2024
Merged

chore: fallback to unary_unary when wrapping async callables #653

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d522265
fix: fallback to unary_unary when wrapping async callables
daniel-sanche May 9, 2024
d089d0d
fixed elif to if
daniel-sanche May 9, 2024
d59b015
removed outdated test
daniel-sanche May 9, 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
Next Next commit
fix: fallback to unary_unary when wrapping async callables 
We recently [made a change](ab22afd) to move some computation in the async rpc wrapper from call-time to wrap-time. This way, individual calls would execute faster, since they don't have to re-compute some data on each call

A side-effect of this change is that now some [type validation](https://github.com/googleapis/python-api-core/blob/d96eb5cdd8120bfec97d62b09512c6fecc325be8/google/api_core/grpc_helpers_async.py#L209) happens earlier. This caused some downstream tests to fail when a mock grpc channel is used. The wrapper doesn't know how to handle the mock.Mock type, and raises an exception while constructing the client object

This PR fixes the issue by falling back to the unary wrapper when the callable type is unknown, rather than raising an exception. This is in-line with how [the sync version handles it](https://github.com/googleapis/python-api-core/blob/d96eb5cdd8120bfec97d62b09512c6fecc325be8/google/api_core/grpc_helpers.py#L198)
  • Loading branch information
@daniel-sanche
daniel-sanche authored May 9, 2024
commit d522265b01c3248ab5b190d63232d0232a91e321
5 changes: 2 additions & 3 deletions google/api_core/grpc_helpers_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,16 +197,15 @@ def wrap_errors(callable_):
Returns: Callable: The wrapped gRPC callable.
"""
grpc_helpers._patch_callable_name(callable_)
if isinstance(callable_, aio.UnaryUnaryMultiCallable):
return _wrap_unary_errors(callable_)

elif isinstance(callable_, aio.UnaryStreamMultiCallable):
return _wrap_stream_errors(callable_, _WrappedUnaryStreamCall)
elif isinstance(callable_, aio.StreamUnaryMultiCallable):
return _wrap_stream_errors(callable_, _WrappedStreamUnaryCall)
elif isinstance(callable_, aio.StreamStreamMultiCallable):
return _wrap_stream_errors(callable_, _WrappedStreamStreamCall)
else:
raise TypeError("Unexpected type of callable: {}".format(type(callable_)))
return _wrap_unary_errors(callable_)


def create_channel(
Expand Down