Merge branch 'master' of github.com:shabbyrobe/grpc-stubs

shabbyrobe · Sep 29, 2023 · 94f7aee · 94f7aee
2 parents ca87563 + 41edee8
commit 94f7aee
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/grpc-stubs/__init__.pyi b/grpc-stubs/__init__.pyi
@@ -616,7 +616,7 @@ class ServerInterceptor(typing.Generic[TRequest, TResponse]):
             typing.Optional[RpcMethodHandler[TRequest, TResponse]]
         ],
         handler_call_details: HandlerCallDetails,
-    ) -> RpcMethodHandler[TRequest, TResponse]:
+    ) -> typing.Optional[RpcMethodHandler[TRequest, TResponse]]:
         ...
 
 
@@ -626,7 +626,7 @@ class UnaryUnaryMultiCallable(typing.Generic[TRequest, TResponse]):
     def __call__(
         self,
         request: TRequest,
-        timeout: typing.Optional[int] = None,
+        timeout: typing.Optional[float] = None,
         metadata: typing.Optional[Metadata] = None,
         credentials: typing.Optional[CallCredentials] = None,
 

diff --git a/grpc-stubs/aio/__init__.pyi b/grpc-stubs/aio/__init__.pyi
@@ -380,7 +380,7 @@ class UnaryUnaryMultiCallable(typing.Generic[TRequest, TResponse]):
     def __call__(
         self,
         request: TRequest,
-        timeout: typing.Optional[int] = None,
+        timeout: typing.Optional[float] = None,
         metadata: typing.Optional[MetadataType] = None,
         credentials: typing.Optional[CallCredentials] = None,
         # FIXME: optional bool seems weird, but that's what the docs suggest

diff --git a/grpc_reflection-stubs/v1alpha/reflection.pyi b/grpc_reflection-stubs/v1alpha/reflection.pyi
@@ -20,7 +20,7 @@ class ReflectionServicer(BaseReflectionServicer):
         ...
 
 def enable_server_reflection(
-    service_names: typing.List[str],
+    service_names: typing.Iterable[str],
     server: AnyServer,
     pool: typing.Optional[descriptor_pool.DescriptorPool] = ...,
 ) -> None:

diff --git a/typesafety/test_grpc.yml b/typesafety/test_grpc.yml
@@ -214,3 +214,15 @@
     server = typing.cast(aio.Server, None)
     enable_server_reflection(["foo"], server, None)
 
+- case: server_interceptor
+  main: |
+    import typing
+    import grpc
+    
+    class NoopInterceptor(grpc.ServerInterceptor):
+        def intercept_service(
+            self,
+            continuation: typing.Callable[[grpc.HandlerCallDetails], typing.Optional[grpc.RpcMethodHandler]],
+            handler_call_details: grpc.HandlerCallDetails,
+        ) -> typing.Optional[grpc.RpcMethodHandler]:
+            return continuation(handler_call_details)