fix: mypy types in get_transport (#2088)

daniel-sanche · web-flow · commit f76fdaf1f717 · 2024-08-06T15:39:57.000-04:00
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2
@@ -5,7 +5,6 @@
 {% import "%namespace/%name_%version/%sub/services/%service/_shared_macros.j2" as shared_macros %}
 
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, {% if service.any_server_streaming %}AsyncIterable, Awaitable, {% endif %}{% if service.any_client_streaming %}AsyncIterator, {% endif %}Sequence, Tuple, Type, Union
 {% if api.all_method_settings.values()|map(attribute="auto_populated_fields", default=[])|list %}
@@ -172,7 +171,7 @@ class {{ service.async_client_name }}:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type({{ service.client_name }}).get_transport_class, type({{ service.client_name }}))
+    get_transport_class = {{ service.client_name }}.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
@@ -548,7 +548,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[{{ service.name  }}Transport], Callable[..., {{ service.name }}Transport]] = (
-                type(self).get_transport_class(transport)
+                {{ service.client_name  }}.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., {{ service.name }}Transport], transport)
             )
diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py b/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, Sequence, Tuple, Type, Union
 
@@ -180,7 +179,7 @@ def universe_domain(self) -> str:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type(AssetServiceClient).get_transport_class, type(AssetServiceClient))
+    get_transport_class = AssetServiceClient.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py b/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py
@@ -628,7 +628,7 @@ def __init__(self, *,
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[AssetServiceTransport], Callable[..., AssetServiceTransport]] = (
-                type(self).get_transport_class(transport)
+                AssetServiceClient.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., AssetServiceTransport], transport)
             )
diff --git a/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/async_client.py b/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/async_client.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, Sequence, Tuple, Type, Union
 
@@ -171,7 +170,7 @@ def universe_domain(self) -> str:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type(IAMCredentialsClient).get_transport_class, type(IAMCredentialsClient))
+    get_transport_class = IAMCredentialsClient.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py b/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py
@@ -565,7 +565,7 @@ def __init__(self, *,
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[IAMCredentialsTransport], Callable[..., IAMCredentialsTransport]] = (
-                type(self).get_transport_class(transport)
+                IAMCredentialsClient.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., IAMCredentialsTransport], transport)
             )
diff --git a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, Sequence, Tuple, Type, Union
 
@@ -198,7 +197,7 @@ def universe_domain(self) -> str:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type(EventarcClient).get_transport_class, type(EventarcClient))
+    get_transport_class = EventarcClient.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py
@@ -673,7 +673,7 @@ def __init__(self, *,
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[EventarcTransport], Callable[..., EventarcTransport]] = (
-                type(self).get_transport_class(transport)
+                EventarcClient.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., EventarcTransport], transport)
             )
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/async_client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/async_client.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, Sequence, Tuple, Type, Union
 
@@ -178,7 +177,7 @@ def universe_domain(self) -> str:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type(ConfigServiceV2Client).get_transport_class, type(ConfigServiceV2Client))
+    get_transport_class = ConfigServiceV2Client.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py
@@ -621,7 +621,7 @@ def __init__(self, *,
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[ConfigServiceV2Transport], Callable[..., ConfigServiceV2Transport]] = (
-                type(self).get_transport_class(transport)
+                ConfigServiceV2Client.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., ConfigServiceV2Transport], transport)
             )
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/async_client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/async_client.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, AsyncIterable, Awaitable, AsyncIterator, Sequence, Tuple, Type, Union
 
@@ -163,7 +162,7 @@ def universe_domain(self) -> str:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type(LoggingServiceV2Client).get_transport_class, type(LoggingServiceV2Client))
+    get_transport_class = LoggingServiceV2Client.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py
@@ -552,7 +552,7 @@ def __init__(self, *,
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[LoggingServiceV2Transport], Callable[..., LoggingServiceV2Transport]] = (
-                type(self).get_transport_class(transport)
+                LoggingServiceV2Client.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., LoggingServiceV2Transport], transport)
             )
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/async_client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/async_client.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, Sequence, Tuple, Type, Union
 
@@ -164,7 +163,7 @@ def universe_domain(self) -> str:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type(MetricsServiceV2Client).get_transport_class, type(MetricsServiceV2Client))
+    get_transport_class = MetricsServiceV2Client.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py
@@ -553,7 +553,7 @@ def __init__(self, *,
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[MetricsServiceV2Transport], Callable[..., MetricsServiceV2Transport]] = (
-                type(self).get_transport_class(transport)
+                MetricsServiceV2Client.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., MetricsServiceV2Transport], transport)
             )
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/async_client.py b/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/async_client.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-import functools
 import re
 from typing import Dict, Callable, Mapping, MutableMapping, MutableSequence, Optional, Sequence, Tuple, Type, Union
 
@@ -188,7 +187,7 @@ def universe_domain(self) -> str:
         """
         return self._client._universe_domain
 
-    get_transport_class = functools.partial(type(CloudRedisClient).get_transport_class, type(CloudRedisClient))
+    get_transport_class = CloudRedisClient.get_transport_class
 
     def __init__(self, *,
             credentials: Optional[ga_credentials.Credentials] = None,
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py b/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py
@@ -582,7 +582,7 @@ def __init__(self, *,
                 credentials = google.auth._default.get_api_key_credentials(api_key_value)
 
             transport_init: Union[Type[CloudRedisTransport], Callable[..., CloudRedisTransport]] = (
-                type(self).get_transport_class(transport)
+                CloudRedisClient.get_transport_class(transport)
                 if isinstance(transport, str) or transport is None
                 else cast(Callable[..., CloudRedisTransport], transport)
             )

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):`
`548`	`548`	`credentials = google.auth._default.get_api_key_credentials(api_key_value)`
`549`	`549`
`550`	`550`	`transport_init: Union[Type[{{ service.name }}Transport], Callable[..., {{ service.name }}Transport]] = (`
`551`		`- type(self).get_transport_class(transport)`
	`551`	`+ {{ service.client_name }}.get_transport_class(transport)`
`552`	`552`	`if isinstance(transport, str) or transport is None`
`553`	`553`	`else cast(Callable[..., {{ service.name }}Transport], transport)`
`554`	`554`	`)`
Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ def __init__(self, *,`
`628`	`628`	`credentials = google.auth._default.get_api_key_credentials(api_key_value)`
`629`	`629`
`630`	`630`	`transport_init: Union[Type[AssetServiceTransport], Callable[..., AssetServiceTransport]] = (`
`631`		`- type(self).get_transport_class(transport)`
	`631`	`+ AssetServiceClient.get_transport_class(transport)`
`632`	`632`	`if isinstance(transport, str) or transport is None`
`633`	`633`	`else cast(Callable[..., AssetServiceTransport], transport)`
`634`	`634`	`)`
Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ def __init__(self, *,`
`565`	`565`	`credentials = google.auth._default.get_api_key_credentials(api_key_value)`
`566`	`566`
`567`	`567`	`transport_init: Union[Type[IAMCredentialsTransport], Callable[..., IAMCredentialsTransport]] = (`
`568`		`- type(self).get_transport_class(transport)`
	`568`	`+ IAMCredentialsClient.get_transport_class(transport)`
`569`	`569`	`if isinstance(transport, str) or transport is None`
`570`	`570`	`else cast(Callable[..., IAMCredentialsTransport], transport)`
`571`	`571`	`)`
Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ def __init__(self, *,`
`673`	`673`	`credentials = google.auth._default.get_api_key_credentials(api_key_value)`
`674`	`674`
`675`	`675`	`transport_init: Union[Type[EventarcTransport], Callable[..., EventarcTransport]] = (`
`676`		`- type(self).get_transport_class(transport)`
	`676`	`+ EventarcClient.get_transport_class(transport)`
`677`	`677`	`if isinstance(transport, str) or transport is None`
`678`	`678`	`else cast(Callable[..., EventarcTransport], transport)`
`679`	`679`	`)`
Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ def __init__(self, *,`
`621`	`621`	`credentials = google.auth._default.get_api_key_credentials(api_key_value)`
`622`	`622`
`623`	`623`	`transport_init: Union[Type[ConfigServiceV2Transport], Callable[..., ConfigServiceV2Transport]] = (`
`624`		`- type(self).get_transport_class(transport)`
	`624`	`+ ConfigServiceV2Client.get_transport_class(transport)`
`625`	`625`	`if isinstance(transport, str) or transport is None`
`626`	`626`	`else cast(Callable[..., ConfigServiceV2Transport], transport)`
`627`	`627`	`)`