googleapis · daniel-sanche · Mar 6, 2026 · Jan 20, 2026 · Jan 20, 2026 · Jan 20, 2026
@@ -100,15 +100,15 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
     This class implements API version {{ service.version }}.{% endif %}"""
 
     @staticmethod
-    def _get_default_mtls_endpoint(api_endpoint):
+    def _get_default_mtls_endpoint(api_endpoint) -> Optional[str]:
         """Converts api endpoint to mTLS endpoint.
 
         Convert "*.sandbox.googleapis.com" and "*.googleapis.com" to
         "*.mtls.sandbox.googleapis.com" and "*.mtls.googleapis.com" respectively.
         Args:
             api_endpoint (Optional[str]): the api endpoint to convert.
         Returns:
-            str: converted mTLS api endpoint.
+            Optional[str]: converted mTLS api endpoint.
         """
         if not api_endpoint:
             return api_endpoint
@@ -118,6 +118,9 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
         )
 
         m = mtls_endpoint_re.match(api_endpoint)
+        if m is None:
+            # could not parse api_endpoint; return as-is
+            return api_endpoint
         name, mtls, sandbox, googledomain = m.groups()
         if mtls or not googledomain:
             return api_endpoint

@@ -3,7 +3,7 @@
     {% if "ListOperations" in api.mixin_api_methods %}
     def list_operations(
         self,
-        request: Optional[operations_pb2.ListOperationsRequest] = None,
+        request: Optional[Union[operations_pb2.ListOperationsRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -26,6 +26,8 @@
         # Create or coerce a protobuf request object.
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = operations_pb2.ListOperationsRequest(**request)
 
@@ -59,7 +61,7 @@
     {% if "GetOperation" in api.mixin_api_methods %}
     def get_operation(
         self,
-        request: Optional[operations_pb2.GetOperationRequest] = None,
+        request: Optional[Union[operations_pb2.GetOperationRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -82,6 +84,8 @@
         # Create or coerce a protobuf request object.
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = operations_pb2.GetOperationRequest(**request)
 
@@ -114,7 +118,7 @@
     {% if "DeleteOperation" in api.mixin_api_methods %}
     def delete_operation(
         self,
-        request: Optional[operations_pb2.DeleteOperationRequest] = None,
+        request: Optional[Union[operations_pb2.DeleteOperationRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -141,6 +145,8 @@
         # Create or coerce a protobuf request object.
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = operations_pb2.DeleteOperationRequest(**request)
 
@@ -165,7 +171,7 @@
     {% if "CancelOperation" in api.mixin_api_methods %}
     def cancel_operation(
         self,
-        request: Optional[operations_pb2.CancelOperationRequest] = None,
+        request: Optional[Union[operations_pb2.CancelOperationRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -191,6 +197,8 @@
         # Create or coerce a protobuf request object.
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = operations_pb2.CancelOperationRequest(**request)
 
@@ -215,7 +223,7 @@
     {% if "WaitOperation" in api.mixin_api_methods %}
     def wait_operation(
         self,
-        request: Optional[operations_pb2.WaitOperationRequest] = None,
+        request: Optional[Union[operations_pb2.WaitOperationRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -244,6 +252,8 @@
         # Create or coerce a protobuf request object.
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = operations_pb2.WaitOperationRequest(**request)
 
@@ -281,7 +291,7 @@
     {% if "SetIamPolicy" in api.mixin_api_methods %}
     def set_iam_policy(
         self,
-        request: Optional[iam_policy_pb2.SetIamPolicyRequest] = None,
+        request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -370,6 +380,8 @@
 
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = iam_policy_pb2.SetIamPolicyRequest(**request)
 
@@ -402,7 +414,7 @@
     {% if "GetIamPolicy" in api.mixin_api_methods %}
     def get_iam_policy(
         self,
-        request: Optional[iam_policy_pb2.GetIamPolicyRequest] = None,
+        request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -492,6 +504,8 @@
 
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = iam_policy_pb2.GetIamPolicyRequest(**request)
 
@@ -524,7 +538,7 @@
     {% if "TestIamPermissions" in api.mixin_api_methods %}
     def test_iam_permissions(
         self,
-        request: Optional[iam_policy_pb2.TestIamPermissionsRequest] = None,
+        request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -552,6 +566,8 @@
 
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = iam_policy_pb2.TestIamPermissionsRequest(**request)
 
@@ -588,7 +604,7 @@
     {% if "GetLocation" in api.mixin_api_methods %}
     def get_location(
         self,
-        request: Optional[locations_pb2.GetLocationRequest] = None,
+        request: Optional[Union[locations_pb2.GetLocationRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -611,6 +627,8 @@
         # Create or coerce a protobuf request object.
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = locations_pb2.GetLocationRequest(**request)
 
@@ -643,7 +661,7 @@
     {% if "ListLocations" in api.mixin_api_methods %}
     def list_locations(
         self,
-        request: Optional[locations_pb2.ListLocationsRequest] = None,
+        request: Optional[Union[locations_pb2.ListLocationsRequest, dict] = None,
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
@@ -666,6 +684,8 @@
         # Create or coerce a protobuf request object.
         # The request isn't a proto-plus wrapped type,
         # so it must be constructed via keyword expansion.
+        if request is None:
+            request = {}
         if isinstance(request, dict):
             request = locations_pb2.ListLocationsRequest(**request)
 

@@ -276,7 +276,7 @@ def _get_http_options():
             elif isinstance(request, google.protobuf.message.Message):
                 request_payload = MessageToJson(request)
             else:
-                request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
+                request_payload = f"{type(request).__name__}: {pickle.dumps(request)!r}"
 
             request_metadata = {
                 key: value.decode("utf-8") if isinstance(value, bytes) else value

@@ -162,7 +162,7 @@ class {{ service.async_client_name }}:
         return self._client.transport
 
     @property
-    def api_endpoint(self):
+    def api_endpoint(self) -> str:
         """Return the API endpoint used by the client instance.
 
         Returns:

@@ -143,15 +143,15 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
     This class implements API version {{ service.version }}.{% endif %}"""
 
     @staticmethod
-    def _get_default_mtls_endpoint(api_endpoint):
+    def _get_default_mtls_endpoint(api_endpoint) -> Optional[str]:
         """Converts api endpoint to mTLS endpoint.
 
         Convert "*.sandbox.googleapis.com" and "*.googleapis.com" to
         "*.mtls.sandbox.googleapis.com" and "*.mtls.googleapis.com" respectively.
         Args:
             api_endpoint (Optional[str]): the api endpoint to convert.
         Returns:
-            str: converted mTLS api endpoint.
+            Optional[str]: converted mTLS api endpoint.
         """
         if not api_endpoint:
             return api_endpoint
@@ -161,6 +161,10 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
         )
 
         m = mtls_endpoint_re.match(api_endpoint)
+        if m is None:
+            # could not parse api_endpoint; return as-is
+            return api_endpoint
+
         name, mtls, sandbox, googledomain = m.groups()
         if mtls or not googledomain:
             return api_endpoint
@@ -387,7 +391,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
         return client_cert_source
 
     @staticmethod
-    def _get_api_endpoint(api_override, client_cert_source, universe_domain, use_mtls_endpoint):
+    def _get_api_endpoint(api_override, client_cert_source, universe_domain, use_mtls_endpoint) -> str:
         """Return the API endpoint used by the client.
 
         Args:
@@ -473,7 +477,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
             error._details.append(json.dumps(cred_info))
 
     @property
-    def api_endpoint(self):
+    def api_endpoint(self) -> str:
         """Return the API endpoint used by the client instance.
 
         Returns:

@@ -76,7 +76,7 @@ class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor):  # pragma: NO
             elif isinstance(result, google.protobuf.message.Message):
                 response_payload = MessageToJson(result)
             else:
-                response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
+                response_payload = f"{type(result).__name__}: {pickle.dumps(result)!r}"
             grpc_response = {
                 "payload": response_payload,
                 "metadata": metadata,

@@ -81,7 +81,7 @@ class _LoggingClientAIOInterceptor(grpc.aio.UnaryUnaryClientInterceptor):  # pra
             elif isinstance(result, google.protobuf.message.Message):
                 response_payload = MessageToJson(result)
             else:
-                response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
+                response_payload = f"{type(result).__name__}: {pickle.dumps(result)!r}"
             grpc_response = {
                 "payload": response_payload,
                 "metadata": metadata,

@@ -91,8 +91,7 @@ nox.options.error_on_missing_interpreters = True
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )
@@ -105,6 +104,8 @@ def mypy(session):
         {% else %}
         "{{ api.naming.versioned_module_name }}",
         {% endif %}
+        "--check-untyped-defs",
+        *session.posargs,
     )
 
 

@@ -146,13 +146,15 @@ def test__get_default_mtls_endpoint():
     sandbox_endpoint = "example.sandbox.googleapis.com"
     sandbox_mtls_endpoint = "example.mtls.sandbox.googleapis.com"
     non_googleapi = "api.example.com"
+    custom_endpoint = ".custom"
 
     assert {{ service.client_name }}._get_default_mtls_endpoint(None) is None
     assert {{ service.client_name }}._get_default_mtls_endpoint(api_endpoint) == api_mtls_endpoint
     assert {{ service.client_name }}._get_default_mtls_endpoint(api_mtls_endpoint) == api_mtls_endpoint
     assert {{ service.client_name }}._get_default_mtls_endpoint(sandbox_endpoint) == sandbox_mtls_endpoint
     assert {{ service.client_name }}._get_default_mtls_endpoint(sandbox_mtls_endpoint) == sandbox_mtls_endpoint
     assert {{ service.client_name }}._get_default_mtls_endpoint(non_googleapi) == non_googleapi
+    assert {{ service.client_name }}._get_default_mtls_endpoint(custom_endpoint) == custom_endpoint
 
 def test__read_environment_variables():
     assert {{ service.client_name }}._read_environment_variables() == (False, "auto", None)

@@ -98,8 +98,7 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )

@@ -98,8 +98,7 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )

@@ -98,8 +98,7 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )

@@ -98,8 +98,7 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )

@@ -98,8 +98,7 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )

@@ -98,8 +98,7 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )

@@ -98,8 +98,7 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
-        "mypy<1.16.0",
+        "mypy",
         "types-requests",
         "types-protobuf",
     )