address review feedback

Author: parthea

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/base.py.j2

@@ -3,7 +3,7 @@
 {% block content %}
 
 import abc
-from typing import {% if service.any_extended_operations_methods or service.has_resumable_upload_methods %}Any, {% endif %}Awaitable, Callable, Dict, Optional, Sequence, Union
+from typing import {% if service.any_extended_operations_methods %}Any, {% endif %}Awaitable, Callable, Dict, Optional, Sequence, Union
 
 {% set package_path = api.naming.module_namespace|join('.') + "." + api.naming.versioned_module_name %}
 from {{package_path}} import gapic_version as package_version
@@ -141,12 +141,9 @@ class {{ service.name }}Transport(abc.ABC):
             credentials = credentials.with_always_use_jwt_access(True)
 
         # Save the credentials.
-        {% if service.has_resumable_upload_methods %}
-        #self._credentials: Any = credentials
         self._credentials = credentials
+        {% if service.has_resumable_upload_methods %}
         self._client_info = client_info
-        {% else %}
-        self._credentials = credentials
         {% endif %}
 
         # Save the hostname. Default to port 443 (HTTPS) if none is specified.

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2

@@ -393,9 +393,13 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport):
                 class _AsyncRestStub:
                     def __call__(self, *args, **kwargs):
                         if transport._rest_transport is None:
+                            {# Note: Type for creds is ignored due to the type hint mismatch for credentials in the base transport.
+                             # TODO(https://github.com/googleapis/google-cloud-python/issues/16268): Remove `# type: ignore` once
+                             # the type hints for credentials are updated to include asynchronous credentials.
+                            #}
                             transport._rest_transport = Async{{ service.name }}RestTransport(
                                 host=transport._host,
-                                credentials=transport._credentials,
+                                credentials=transport._credentials,  # type: ignore
                                 client_info=transport._client_info,
                             )
                         return transport._rest_transport.{{ method.transport_safe_name|snake_case }}(*args, **kwargs)

packages/gapic-generator/tests/integration/goldens/showcase/google/showcase_v1beta1/services/resumable_upload_service/transports/base.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import abc
-from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union
+from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
 
 from google.showcase_v1beta1 import gapic_version as package_version
 
@@ -116,7 +116,6 @@ def __init__(
             credentials = credentials.with_always_use_jwt_access(True)
 
         # Save the credentials.
-        #self._credentials: Any = credentials
         self._credentials = credentials
         self._client_info = client_info
 

packages/gapic-generator/tests/integration/goldens/showcase/google/showcase_v1beta1/services/resumable_upload_service/transports/grpc_asyncio.py

@@ -373,7 +373,7 @@ def __call__(self, *args, **kwargs):
                         if transport._rest_transport is None:
                             transport._rest_transport = AsyncResumableUploadServiceRestTransport(
                                 host=transport._host,
-                                credentials=transport._credentials,
+                                credentials=transport._credentials,  # type: ignore
                                 client_info=transport._client_info,
                             )
                         return transport._rest_transport.upload_media(*args, **kwargs)