acocuzzo
diff --git a/‎google/api_core/gapic_v1/method.py
Lines changed: 16 additions & 9 deletions b/‎google/api_core/gapic_v1/method.py
Lines changed: 16 additions & 9 deletions
diff --git a/‎google/api_core/gapic_v1/method_async.py
Lines changed: 3 additions & 4 deletions b/‎google/api_core/gapic_v1/method_async.py
Lines changed: 3 additions & 4 deletions
diff --git a/‎google/api_core/operations_v1/abstract_operations_client.py
Lines changed: 6 additions & 0 deletions b/‎google/api_core/operations_v1/abstract_operations_client.py
Lines changed: 6 additions & 0 deletions
diff --git a/‎google/api_core/operations_v1/operations_async_client.py
Lines changed: 11 additions & 9 deletions b/‎google/api_core/operations_v1/operations_async_client.py
Lines changed: 11 additions & 9 deletions
diff --git a/‎google/api_core/operations_v1/operations_client.py
Lines changed: 2 additions & 2 deletions b/‎google/api_core/operations_v1/operations_client.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎google/api_core/operations_v1/transports/rest.py
Lines changed: 5 additions & 0 deletions b/‎google/api_core/operations_v1/transports/rest.py
Lines changed: 5 additions & 0 deletions
diff --git a/‎tests/asyncio/gapic/test_method_async.py
Lines changed: 5 additions & 5 deletions b/‎tests/asyncio/gapic/test_method_async.py
Lines changed: 5 additions & 5 deletions
@@ -15,7 +15,7 @@
 """Helpers for wrapping low-level gRPC methods with common functionality.
 
 This is used by gapic clients to provide common error mapping, retry, timeout,
-pagination, and long-running operations to gRPC methods.
+compression, pagination, and long-running operations to gRPC methods.
 """
 
 import enum
@@ -73,19 +73,21 @@ class _GapicCallable(object):
             after its start, not to be confused with deadline). If ``None``,
             this callable will not specify a timeout argument to the low-level
             RPC method.
+        compression (grpc.Compression): The default compression for the callable.
+            If ``None``, this callable will not specify a compression argument
+            to the low-level RPC method.
         metadata (Sequence[Tuple[str, str]]): Additional metadata that is
             provided to the RPC method on every invocation. This is merged with
             any metadata specified during invocation. If ``None``, no
             additional metadata will be passed to the RPC method.
-        compression (grpc.Compression): Indicates the compression method to be used for an RPC.
     """
 
     def __init__(
         self,
         target,
         retry,
         timeout,
-        compression=Compression.NoCompression,
+        compression,
         metadata=None,
     ):
         self._target = target
@@ -112,7 +114,7 @@ def __call__(
             timeout = TimeToDeadlineTimeout(timeout=timeout)
 
         # Apply all applicable decorators.
-        wrapped_func = _apply_decorators(self._target, [retry, timeout, compression])
+        wrapped_func = _apply_decorators(self._target, [retry, timeout])
 
         # Add the user agent metadata to the call.
         if self._metadata is not None:
@@ -124,6 +126,8 @@ def __call__(
             metadata = list(metadata)
             metadata.extend(self._metadata)
             kwargs["metadata"] = metadata
+        if self._compression is not None:
+            kwargs["compression"] = compression
 
         return wrapped_func(*args, **kwargs)
 
@@ -132,7 +136,7 @@ def wrap_method(
     func,
     default_retry=None,
     default_timeout=None,
-    default_compression=Compression.NoCompression,
+    default_compression=None,
     client_info=client_info.DEFAULT_CLIENT_INFO,
 ):
     """Wrap an RPC method with common behavior.
@@ -146,6 +150,7 @@ def wrap_method(
         import google.api_core.gapic_v1.method
         from google.api_core import retry
         from google.api_core import timeout
+        from grpc import Compression
 
         # The original RPC method.
         def get_topic(name, timeout=None):
@@ -154,6 +15
B41A
9,7 @@ def get_topic(name, timeout=None):
 
         default_retry = retry.Retry(deadline=60)
         default_timeout = timeout.Timeout(deadline=60)
+        default_compression = Compression.NoCompression
         wrapped_get_topic = google.api_core.gapic_v1.method.wrap_method(
             get_topic, default_retry)
 
@@ -203,7 +209,8 @@ def get_topic(name, timeout=None):
             timeout strategy. Can also be specified as an int or float. If
             ``None``, the method will not have timeout specified by default.
         default_compression (Optional[grpc.Compression]): The default
-            grpc.Compression.
+            grpc.Compression. If ``None``, the method will not have
+            compression specified by default.
         client_info
             (Optional[google.api_core.gapic_v1.client_info.ClientInfo]):
                 Client information used to create a user-agent string that's
@@ -212,12 +219,12 @@ def get_topic(name, timeout=None):
                 metadata will be provided to the RPC method.
 
     Returns:
-        Callable: A new callable that takes optional ``retry`` and ``timeout``
-            arguments and applies the common error mapping, retry, timeout,
+        Callable: A new callable that takes optional ``retry``, ``timeout``,
+            and ``compression``
+            arguments and applies the common error mapping, retry, timeout, compression,
             and metadata behavior to the low-level RPC method.
     """
     func = grpc_helpers.wrap_errors(func)
-
     if client_info is not None:
         user_agent_metadata = [client_info.to_grpc_metadata()]
     else:
 
@@ -14,7 +14,7 @@
 """AsyncIO helpers for wrapping gRPC methods with common functionality.
 
 This is used by gapic clients to provide common error mapping, retry, timeout,
-pagination, and long-running operations to gRPC methods.
+compression, pagination, and long-running operations to gRPC methods.
 """
 
 import functools
@@ -24,14 +24,13 @@
 from google.api_core.gapic_v1.method import _GapicCallable
 from google.api_core.gapic_v1.method import DEFAULT  # noqa: F401
 from google.api_core.gapic_v1.method import USE_DEFAULT_METADATA  # noqa: F401
-from grpc import Compression
 
 
 def wrap_method(
     func,
     default_retry=None,
     default_timeout=None,
-    default_compression=Compression.NoCompression,
+    default_compression=None,
     client_info=client_info.DEFAULT_CLIENT_INFO,
 ):
     """Wrap an async RPC method with common behavior.
@@ -50,7 +49,7 @@ def wrap_method(
             func,
             default_retry,
             default_timeout,
-            compression=default_compression,
+            default_compression,
             metadata=metadata,
         )
     )
@@ -33,6 +33,7 @@
 from google.auth.transport import mtls  # type: ignore
 from google.longrunning import operations_pb2
 from google.oauth2 import service_account  # type: ignore
+import grpc
 
 OptionalRetry = Union[retries.Retry, object]
 
@@ -368,6 +369,7 @@ def list_operations(
         page_token: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] =  gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListOperationsPager:
         r"""Lists operations that match the specified filter in the request.
@@ -450,6 +452,7 @@ def get_operation(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] = gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operations_pb2.Operation:
         r"""Gets the latest state of a long-running operation.
@@ -502,6 +505,7 @@ def delete_operation(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] = gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
         r"""Deletes a long-running operation. This method indicates that the
@@ -550,6 +554,7 @@ def cancel_operation(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] = gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
         r"""Starts asynchronous cancellation on a long-running operation.
@@ -598,5 +603,6 @@ def cancel_operation(
             request,
             retry=retry,
             timeout=timeout,
+            compression=compression,
             metadata=metadata,
         )
@@ -29,7 +29,7 @@
 from google.api_core import retry as retries
 from google.api_core import timeout as timeouts
 from google.longrunning import operations_pb2
-
+import grpc
 
 class OperationsAsyncClient:
     """Async client for interacting with long-running operations.
@@ -59,40 +59,42 @@ def __init__(self, channel, client_config=None):
         )
         default_timeout = timeouts.TimeToDeadlineTimeout(timeout=600.0)
 
+        default_compression = grpc.Compression.NoCompression
+
         self._get_operation = gapic_v1.method_async.wrap_method(
             self.operations_stub.GetOperation,
             default_retry=default_retry,
             default_timeout=default_timeout,
-            default_compression=method_configs["GetOperation"].compression,
+            default_compression=default_compression,
         )
 
         self._list_operations = gapic_v1.method_async.wrap_method(
             self.operations_stub.ListOperations,
             default_retry=default_retry,
             default_timeout=default_timeout,
-            default_compression=method_configs["ListOperations"].compression,
+            default_compression=default_compression,
         )
 
         self._cancel_operation = gapic_v1.method_async.wrap_method(
             self.operations_stub.CancelOperation,
             default_retry=default_retry,
             default_timeout=default_timeout,
-            default_compression=method_configs["CancelOperation"].compression,
+            default_compression=default_compression,
         )
 
         self._delete_operation = gapic_v1.method_async.wrap_method(
             self.operations_stub.DeleteOperation,
             default_retry=default_retry,
             default_timeout=default_timeout,
-            default_compression=method_configs["DeleteOperation"].compression,
+            default_compression=default_compression,
         )
 
     async def get_operation(
         self,
         name,
         retry=gapic_v1.method_async.DEFAULT,
         timeout=gapic_v1.method_async.DEFAULT,
-        compression=None,
+        compression=gapic_v1.method_async.DEFAULT,
         metadata=None,
     ):
         """Gets the latest state of a long-running operation.
@@ -153,7 +155,7 @@ async def list_operations(
         filter_,
         retry=gapic_v1.method_async.DEFAULT,
         timeout=gapic_v1.method_async.DEFAULT,
-        compression=None,
+        compression=gapic_v1.method_async.DEFAULT,
         metadata=None,
     ):
         """
@@ -239,7 +241,7 @@ async def cancel_operation(
         name,
         retry=gapic_v1.method_async.DEFAULT,
         timeout=gapic_v1.method_async.DEFAULT,
-        compression=None,
+        compression=gapic_v1.method_async.DEFAULT,
         metadata=None,
     ):
         """Starts asynchronous cancellation on a long-running operation.
@@ -305,7 +307,7 @@ async def delete_operation(
         name,
         retry=gapic_v1.method_async.DEFAULT,
         timeout=gapic_v1.method_async.DEFAULT,
-        compression=None,
+        compression=gapic_v1.method_async.DEFAULT,
         metadata=None,
     ):
         """Deletes a long-running operation.
 
@@ -109,7 +109,7 @@ def get_operation(
         name,
         retry=gapic_v1.method.DEFAULT,
         timeout=gapic_v1.method.DEFAULT,
-        compression=Compression.NoCompression,
+        compression=gapic_v1.method.DEFAULT,
         metadata=None,
     ):
         """Gets the latest state of a long-running operation.
@@ -170,7 +170,7 @@ def list_operations(
         filter_,
         retry=gapic_v1.method.DEFAULT,
         timeout=gapic_v1.method.DEFAULT,
-        compression=Compression.NoCompression,
+        compression=gapic_v1.method.DEFAULT,
         metadata=None,
     ):
         """
 
@@ -29,6 +29,7 @@
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import json_format  # type: ignore
+import grpc
 from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO, OperationsTransport
 
 OptionalRetry = Union[retries.Retry, object]
@@ -149,6 +150,7 @@ def _list_operations(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] = gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operations_pb2.ListOperationsResponse:
         r"""Call the list operations method over HTTP.
@@ -228,6 +230,7 @@ def _get_operation(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] = gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operations_pb2.Operation:
         r"""Call the get operation method over HTTP.
@@ -308,6 +311,7 @@ def _delete_operation(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] = gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> empty_pb2.Empty:
         r"""Call the delete operation method over HTTP.
@@ -378,6 +382,7 @@ def _cancel_operation(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
+        compression: Optional[grpc.Compression] = gapic_v1.method.DEFAULT,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> empty_pb2.Empty:
         r"""Call the cancel operation method over HTTP.
 
@@ -98,11 +98,11 @@ async def test_wrap_method_with_no_compression():
     fake_call = grpc_helpers_async.FakeUnaryUnaryCall()
     method = mock.Mock(spec=aio.UnaryUnaryMultiCallable, return_value=fake_call)
 
-    wrapped_method = gapic_v1.method_async.wrap_method(method, compression=None)
+    wrapped_method = gapic_v1.method_async.wrap_method(method)
 
-    await wrapped_method(1, 2, meep="moop")
+    await wrapped_method(1, 2, meep="moop", compression=None)
 
-    method.assert_called_once_with(1, 2, meep="moop")
+    method.assert_called_once_with(1, 2, meep<
8DA2
/span>="moop", compression=None)
 
 
 @pytest.mark.asyncio
@@ -111,9 +111,9 @@ async def test_wrap_method_with_custom_compression():
     fake_call = grpc_helpers_async.FakeUnaryUnaryCall()
     method = mock.Mock(spec=aio.UnaryUnaryMultiCallable, return_value=fake_call)
 
-    wrapped_method = gapic_v1.method_async.wrap_method(method, compression=compression)
+    wrapped_method = gapic_v1.method_async.wrap_method(method)
 
-    await wrapped_method(1, 2, meep="moop")
+    await wrapped_method(1, 2, meep="moop", compression=compression)
 
     method.assert_called_once_with(1, 2, meep="moop", compression=compression)