Automatically add future annotations import

conformance/test/_util.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 import sys
 

conformance/test/client.py

@@ -1,12 +1,13 @@
+from __future__ import annotations
+
 import argparse
 import asyncio
 import ssl
 import sys
 import time
 import traceback
-from collections.abc import AsyncIterator, Iterator
 from tempfile import NamedTemporaryFile
-from typing import Literal, TypeVar
+from typing import TYPE_CHECKING, Literal, TypeVar
 
 import httpx
 from _util import create_standard_streams
@@ -29,14 +30,18 @@
     UnaryRequest,
     UnimplementedRequest,
 )
-from google.protobuf.any_pb2 import Any
 from google.protobuf.message import Message
 
 from connectrpc.client import ResponseMetadata
 from connectrpc.code import Code
 from connectrpc.errors import ConnectError
 from connectrpc.request import Headers
 
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator, Iterator
+
+    from google.protobuf.any_pb2 import Any
+
 
 def _convert_code(error: Code) -> ConformanceCode:
     match error:

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

@@ -1,15 +1,13 @@
 # Generated by https://github.com/connectrpc/connect-python.  DO NOT EDIT!
 # source: connectrpc/conformance/v1/service.proto
+from __future__ import annotations
 
-from collections.abc import AsyncGenerator, AsyncIterator, Iterable, Iterator, Mapping
-from typing import Protocol
+from typing import TYPE_CHECKING, Protocol
 
 from connectrpc.client import ConnectClient, ConnectClientSync
 from connectrpc.code import Code
 from connectrpc.errors import ConnectError
-from connectrpc.interceptor import Interceptor, InterceptorSync
 from connectrpc.method import IdempotencyLevel, MethodInfo
-from connectrpc.request import Headers, RequestContext
 from connectrpc.server import (
     ConnectASGIApplication,
     ConnectWSGIApplication,
@@ -19,6 +17,18 @@
 
 from . import service_pb2 as connectrpc_dot_conformance_dot_v1_dot_service__pb2
 
+if TYPE_CHECKING:
+    from collections.abc import (
+        AsyncGenerator,
+        AsyncIterator,
+        Iterable,
+        Iterator,
+        Mapping,
+    )
+
+    from connectrpc.interceptor import Interceptor, InterceptorSync
+    from connectrpc.request import Headers, RequestContext
+
 
 class ConformanceService(Protocol):
     async def unary(

conformance/test/server.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import asyncio
 import os
@@ -7,7 +9,6 @@
 import ssl
 import sys
 import time
-from collections.abc import AsyncIterator, Iterator
 from contextlib import ExitStack, closing
 from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING, Literal, TypeVar, get_args
@@ -43,14 +44,17 @@
 
 from connectrpc.code import Code
 from connectrpc.errors import ConnectError
-from connectrpc.request import RequestContext
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncIterator, Iterator
+
     from google.protobuf.message import Message
 
+    from connectrpc.request import RequestContext
+
 
 # TODO: Use google.protobuf.any.pack on upgrade to protobuf==6.
-def pack(msg: "Message") -> Any:
+def pack(msg: Message) -> Any:
     any_msg = Any()
     any_msg.Pack(msg)
     return any_msg

conformance/test/test_client.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 import sys
 from pathlib import Path

conformance/test/test_server.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import subprocess
 import sys

example/example/_eliza.py

@@ -1,6 +1,11 @@
+from __future__ import annotations
+
 import random
 import re
-from collections.abc import Sequence
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 # Ported from https://github.com/connectrpc/examples-go
 # Originally from https://github.com/mattshiel/eliza-go

example/example/eliza_client.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 
 from example.eliza_connect import ElizaServiceClient

example/example/eliza_client_sync.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from example.eliza_connect import ElizaServiceClientSync
 from example.eliza_pb2 import IntroduceRequest, SayRequest
 

example/example/eliza_connect.py

@@ -1,15 +1,13 @@
 # Generated by https://github.com/connectrpc/connect-python.  DO NOT EDIT!
 # source: example/eliza.proto
+from __future__ import annotations
 
-from collections.abc import AsyncGenerator, AsyncIterator, Iterable, Iterator, Mapping
-from typing import Protocol
+from typing import TYPE_CHECKING, Protocol
 
 from connectrpc.client import ConnectClient, ConnectClientSync
 from connectrpc.code import Code
 from connectrpc.errors import ConnectError
-from connectrpc.interceptor import Interceptor, InterceptorSync
 from connectrpc.method import IdempotencyLevel, MethodInfo
-from connectrpc.request import Headers, RequestContext
 from connectrpc.server import (
     ConnectASGIApplication,
     ConnectWSGIApplication,
@@ -19,6 +17,18 @@
 
 import example.eliza_pb2 as example_dot_eliza__pb2
 
+if TYPE_CHECKING:
+    from collections.abc import (
+        AsyncGenerator,
+        AsyncIterator,
+        Iterable,
+        Iterator,
+        Mapping,
+    )
+
+    from connectrpc.interceptor import Interceptor, InterceptorSync
+    from connectrpc.request import Headers, RequestContext
+
 
 class ElizaService(Protocol):
     async def say(

example/example/eliza_service.py

@@ -1,8 +1,8 @@
+from __future__ import annotations
+
 import asyncio
-from collections.abc import AsyncIterator
 from typing import TYPE_CHECKING, cast
 
-from connectrpc.request import RequestContext
 from starlette.applications import Starlette
 from starlette.responses import PlainTextResponse
 from starlette.routing import Mount, Route
@@ -19,6 +19,9 @@
 )
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
+
+    from connectrpc.request import RequestContext
     from starlette.types import ASGIApp
 
 

example/example/eliza_service_sync.py

@@ -1,7 +1,8 @@
+from __future__ import annotations
+
 import time
-from collections.abc import Iterator
+from typing import TYPE_CHECKING
 
-from connectrpc.request import RequestContext
 from flask import Flask
 from werkzeug.middleware.dispatcher import DispatcherMiddleware
 
@@ -17,6 +18,11 @@
 from . import _eliza
 from .eliza_connect import ElizaServiceSync, ElizaServiceWSGIApplication
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+    from connectrpc.request import RequestContext
+
 
 class DemoElizaServiceSync(ElizaServiceSync):
     stream_delay_secs: float

justfile

@@ -7,7 +7,7 @@ BUF_VERSION := "v1.57.0"
 
 # Format Python files
 format:
-    uv run ruff check --fix .
+    uv run ruff check --fix --unsafe-fixes --exit-zero .
     uv run ruff format .
 
 # Lint Python files

noextras/test/test_compression_default.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 from example.eliza_connect import (
     ElizaService,

protoc-gen-connect-python/scripts/generate_wheels.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import shutil
 import subprocess

pyproject.toml

@@ -184,6 +184,8 @@ extend-ignore = [
     "PLR",
 ]
 
+typing-extensions = false
+
 [tool.ruff.lint.per-file-ignores]
 "conformance/test/**" = ["ANN", "INP", "SLF", "SIM115", "S101", "D"]
 "example/**" = [
@@ -206,6 +208,7 @@ extend-ignore = [
 ]
 
 [tool.ruff.lint.isort]
+required-imports = ["from __future__ import annotations"]
 split-on-trailing-comma = false
 
 [tool.ruff]

src/connectrpc/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 __all__ = ["__version__"]
 
 

src/connectrpc/_asyncio_timeout.py

@@ -2,11 +2,15 @@
 # SPDX-License-Identifier: PSF-2.0
 
 # Backport of asyncio.timeout for Python 3.10
+from __future__ import annotations
 
 import enum
 import sys
 from asyncio import events, exceptions, tasks
-from types import TracebackType
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from types import TracebackType
 
 _HAX_EXCEPTION_GROUP = sys.version_info >= (3, 11)
 
@@ -80,7 +84,7 @@ def __repr__(self) -> str:
         info_str = " ".join(info)
         return f"<Timeout [{self._state.value}]{info_str}>"
 
-    async def __aenter__(self) -> "Timeout":
+    async def __aenter__(self) -> Timeout:
         if self._state is not _State.CREATED:
             msg = "Timeout has already been entered"
             raise RuntimeError(msg)

src/connectrpc/_client_async.py

@@ -1,8 +1,8 @@
+from __future__ import annotations
+
 import asyncio
 import functools
 from asyncio import CancelledError, sleep, wait_for
-from collections.abc import AsyncIterator, Iterable, Mapping
-from types import TracebackType
 from typing import TYPE_CHECKING, Any, Protocol, TypeVar
 
 import httpx
@@ -11,7 +11,6 @@
 from . import _client_shared
 from ._asyncio_timeout import timeout as asyncio_timeout
 from ._codec import Codec, get_proto_binary_codec, get_proto_json_codec
-from ._compression import Compression
 from ._envelope import EnvelopeReader, EnvelopeWriter
 from ._interceptor_async import (
     BidiStreamInterceptor,
@@ -24,8 +23,6 @@
 from ._protocol import CONNECT_STREAMING_HEADER_COMPRESSION, ConnectWireError
 from .code import Code
 from .errors import ConnectError
-from .method import MethodInfo
-from .request import Headers, RequestContext
 
 try:
     from asyncio import (
@@ -36,6 +33,12 @@
 
 if TYPE_CHECKING:
     import sys
+    from collections.abc import AsyncIterator, Iterable, Mapping
+    from types import TracebackType
+
+    from ._compression import Compression
+    from .method import MethodInfo
+    from .request import Headers, RequestContext
 
     if sys.version_info >= (3, 11):
         from typing import Self

src/connectrpc/_client_shared.py

@@ -1,12 +1,10 @@
+from __future__ import annotations
+
 import base64
 import contextlib
-from collections.abc import Iterable, Mapping, Sequence
 from contextvars import ContextVar, Token
 from http import HTTPStatus
-from types import TracebackType
-from typing import TypeVar
-
-from httpx import Headers as HttpxHeaders
+from typing import TYPE_CHECKING, TypeVar
 
 from . import _compression
 from ._codec import CODEC_NAME_JSON, CODEC_NAME_JSON_CHARSET_UTF8, Codec
@@ -25,9 +23,16 @@
 from ._version import __version__
 from .code import Code
 from .errors import ConnectError
-from .method import MethodInfo
 from .request import Headers, RequestContext
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping, Sequence
+    from types import TracebackType
+
+    from httpx import Headers as HttpxHeaders
+
+    from .method import MethodInfo
+
 _DEFAULT_CONNECT_USER_AGENT = f"connectrpc/{__version__}"
 
 REQ = TypeVar("REQ")
@@ -247,9 +252,9 @@ class ResponseMetadata:
 
     _headers: Headers | None = None
     _trailers: Headers | None = None
-    _token: Token["ResponseMetadata"] | None = None
+    _token: Token[ResponseMetadata] | None = None
 
-    def __enter__(self) -> "ResponseMetadata":
+    def __enter__(self) -> ResponseMetadata:
         self._token = _current_response.set(self)
         return self