Simpler

Author: anuraaga

conformance/test/gen/connectrpc/conformance/v1/service_connect.py

@@ -75,7 +75,7 @@ async def idempotent_unary(
 class ConformanceServiceASGIApplication(ConnectASGIApplication[ConformanceService]):
     def __init__(
         self,
-        service: ConformanceService | AsyncGenerator[ConformanceService, None],
+        service: ConformanceService | AsyncGenerator[ConformanceService],
         *,
         interceptors: Iterable[Interceptor] = (),
         read_max_bytes: int | None = None,

example/example/eliza_connect.py

@@ -42,7 +42,7 @@ def introduce(
 class ElizaServiceASGIApplication(ConnectASGIApplication[ElizaService]):
     def __init__(
         self,
-        service: ElizaService | AsyncGenerator[ElizaService, None],
+        service: ElizaService | AsyncGenerator[ElizaService],
         *,
         interceptors: Iterable[Interceptor] = (),
         read_max_bytes: int | None = None,

protoc-gen-connect-python/generator/template.go

@@ -68,7 +68,7 @@ class {{.Name}}(Protocol):{{- range .Methods }}
 {{ end }}
 
 class {{.Name}}ASGIApplication(ConnectASGIApplication[{{.Name}}]):
-    def __init__(self, service: {{.Name}} | AsyncGenerator[{{.Name}}, None], *, interceptors: Iterable[Interceptor]=(), read_max_bytes: int | None = None) -> None:
+    def __init__(self, service: {{.Name}} | AsyncGenerator[{{.Name}}], *, interceptors: Iterable[Interceptor]=(), read_max_bytes: int | None = None) -> None:
         super().__init__(
             service=service,
             endpoints=lambda svc: { {{- range .Methods }}

src/connectrpc/_server_async.py

@@ -85,7 +85,7 @@ def path(self) -> str: ...
     def __init__(
         self,
         *,
-        service: _SVC | AsyncGenerator[_SVC, None],
+        service: _SVC | AsyncGenerator[_SVC],
         endpoints: Callable[[_SVC], Mapping[str, Endpoint]],
         interceptors: Iterable[Interceptor] = (),
         read_max_bytes: int | None = None,

test/haberdasher_connect.py

@@ -57,7 +57,7 @@ async def do_nothing(
 class HaberdasherASGIApplication(ConnectASGIApplication[Haberdasher]):
     def __init__(
         self,
-        service: Haberdasher | AsyncGenerator[Haberdasher, None],
+        service: Haberdasher | AsyncGenerator[Haberdasher],
         *,
         interceptors: Iterable[Interceptor] = (),
         read_max_bytes: int | None = None,