revert sync grpc file

Author: ohmayr

gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2

@@ -2,7 +2,6 @@
 
 {% block content %}
 
-import json
 import logging as std_logging
 import warnings
 from typing import Callable, Dict, Optional, Sequence, Tuple, Union
@@ -45,9 +44,6 @@ from google.longrunning import operations_pb2 # type: ignore
 {% endfilter %}
 from .base import {{ service.name }}Transport, DEFAULT_CLIENT_INFO
 
-import proto
-import google.protobuf.message
-
 try:
     from google.api_core import client_logging  # type: ignore
     CLIENT_LOGGING_SUPPORTED = True  # pragma: NO COVER
@@ -59,11 +55,11 @@ _LOGGER = std_logging.getLogger(__name__)
 
 class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor):  # pragma: NO COVER
     def intercept_unary_unary(self, continuation, client_call_details, request):
-        request_metadata = client_call_details.metadata
-        if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG):
-            if isinstance(request, proto.Message):
+        if CLIENT_LOGGING_SUPPORTED and not _LOGGER.isEnabledFor(std_logging.NOTSET):  # pragma: NO COVER
+            request_metadata = client_call_details.metadata
+            try:
                 request_payload = type(request).to_json(request)
-            elif isinstance(request, google.protobuf.message.Message):
+            except:
                 request_payload = MessageToJson(request)
             grpc_request = {
                 "payload": request_payload,
@@ -76,37 +72,33 @@ class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor):  # pragma: NO
                     "serviceName": "{{ service.meta.address.proto }}",
                     "rpcName": client_call_details.method,
                     "request": grpc_request,
-                    {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2275): logging `metadata` seems repetitive and may need to be cleaned up. We're including it within "request" for consistency with REST transport.' #}
+                    {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2275): logging `metadata` seems repetitive and may need to be cleaned up. We're including it within "request" for consistency with REST transport. #}
                     "metadata": grpc_request["metadata"],
                 },
             )
 
         response = continuation(client_call_details, request)
-        response_metadata = response.trailing_metadata()
-        # Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
-        metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
-        result = response.result()
-        if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG):  # pragma: NO COVER
-            if isinstance(result, proto.Message):
+        if CLIENT_LOGGING_SUPPORTED and not _LOGGER.isEnabledFor(std_logging.NOTSET):  # pragma: NO COVER
+            response_metadata = response.trailing_metadata()
+            # Convert gRPC metadata `<class 'grpc.aio._metadata.Metadata'>` to list of tuples
+            metadata = dict([(k, v) for k, v in response_metadata]) if response_metadata else None
+            result = response.result()
+            try:
                 response_payload = type(result).to_json(result)
-            elif isinstance(result, google.protobuf.message.Message):
+            except:
                 response_payload = MessageToJson(result)
-            else:
-                if isinstance(result, bytes):
-                    result = result.decode('utf-8')
-                response_payload = json.dumps(result)
             grpc_response = {
                 "payload": response_payload,
                 "metadata": metadata,
-                "status": "OK",
+                "status": "OK", 
             }
             _LOGGER.debug(
                 f"Received response for {client_call_details.method}.",
                 extra = {
                     "serviceName": "{{ service.meta.address.proto }}",
                     "rpcName": client_call_details.method,
                     "response": grpc_response,
-                    {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2275): logging `metadata` seems repetitive and may need to be cleaned up. We're including it within "request" for consistency with REST transport.' #}
+                    {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2275): logging `metadata` seems repetitive and may need to be cleaned up. We're including it within "request" for consistency with REST transport. #}
                     "metadata": grpc_response["metadata"],
                 },
             )
@@ -266,7 +258,7 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport):
             )
 
         self._grpc_channel = self._base_channel
-        if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(std_logging.DEBUG):  # pragma: NO COVER
+        if CLIENT_LOGGING_SUPPORTED and not _LOGGER.isEnabledFor(std_logging.NOTSET):  # pragma: NO COVER
             self._interceptor = _LoggingClientInterceptor()
             self._grpc_channel =  grpc.intercept_channel(self._base_channel, self._interceptor)