Skip to content

Commit 1b4d4af

Browse files
lesnik512claude
andcommitted
feat(story-2.1): compose() chain composer with empty and single-middleware cases
Adds src/httpware/_internal/chain.compose(middlewares, transport) -> Next using a recursive closure fold. Bottom of chain is transport.__call__ (bound method, no wrapper). Empty sequence returns transport.__call__ directly. Tests verify both cases against a minimal _OkTransport fixture. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent cb623d6 commit 1b4d4af

3 files changed

Lines changed: 99 additions & 1 deletion

File tree

‎src/httpware/_internal/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""Private cross-module helpers (not part of the public API)."""

‎src/httpware/_internal/chain.py‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
"""Middleware chain composition — wires a middleware list against a Transport.
2+
3+
Private helper. AsyncClient calls `compose` at construction time and stores the
4+
returned `Next` callable; per-request dispatch awaits that callable.
5+
"""
6+
7+
from collections.abc import Sequence
8+
9+
from httpware.middleware import Middleware, Next
10+
from httpware.request import Request
11+
from httpware.response import Response
12+
from httpware.transports import Transport
13+
14+
15+
def compose(middlewares: Sequence[Middleware], transport: Transport) -> Next:
16+
"""Fold `middlewares` into a single `Next` callable terminating at `transport`.
17+
18+
The outermost middleware in the input sequence is the first to receive the
19+
request; its `next` argument forwards to the next middleware, and so on,
20+
until the innermost middleware's `next` calls `transport.__call__`. An
21+
empty sequence returns `transport.__call__` directly.
22+
23+
The returned callable is reusable across many requests; it captures
24+
references to `middlewares` and `transport` by closure.
25+
"""
26+
chain: Next = transport.__call__
27+
for middleware in reversed(middlewares):
28+
chain = _wrap(middleware, chain)
29+
return chain
30+
31+
32+
def _wrap(middleware: Middleware, next_call: Next) -> Next:
33+
async def _call(request: Request) -> Response:
34+
return await middleware(request, next_call)
35+
36+
return _call
37+
38+
39+
__all__ = ["compose"]

‎tests/test_middleware.py‎

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
"""Tests for the Middleware protocol and chain composition."""
22

33
from collections.abc import Awaitable, Callable
4+
from contextlib import AbstractAsyncContextManager
45
from typing import get_type_hints
56

7+
from httpware._internal.chain import compose
68
from httpware.middleware import Middleware, Next
79
from httpware.request import Request
8-
from httpware.response import Response
10+
from httpware.response import Response, StreamResponse
911

1012

1113
class _SignalMiddleware:
@@ -31,3 +33,59 @@ def test_next_annotation_on_signal_middleware() -> None:
3133
"""`next` parameter on `_SignalMiddleware.__call__` is annotated with `Next`."""
3234
hints = get_type_hints(_SignalMiddleware.__call__)
3335
assert hints["next"] == Next
36+
37+
38+
class _OkTransport:
39+
"""Minimal Transport: returns a fixed Response, no streaming, no aclose work."""
40+
41+
async def __call__(self, request: Request) -> Response:
42+
return Response(
43+
status=200,
44+
headers={"x-from": "transport"},
45+
content=b"transport",
46+
url=request.url,
47+
elapsed=0.0,
48+
)
49+
50+
def stream( # pragma: no cover - not exercised in 2-1
51+
self, request: Request
52+
) -> AbstractAsyncContextManager[StreamResponse]:
53+
raise NotImplementedError
54+
55+
async def aclose(self) -> None: # pragma: no cover - not exercised in 2-1
56+
return None
57+
58+
59+
def _make_request(method: str = "GET", url: str = "https://example.test/") -> Request:
60+
return Request(method=method, url=url)
61+
62+
63+
async def test_empty_list_composes_to_transport_call() -> None:
64+
"""compose([], transport) yields a callable that behaves like transport(req)."""
65+
transport = _OkTransport()
66+
dispatch = compose([], transport)
67+
68+
request = _make_request()
69+
response = await dispatch(request)
70+
71+
assert response.status == 200 # noqa: PLR2004
72+
assert response.content == b"transport"
73+
assert response.headers["x-from"] == "transport"
74+
75+
76+
async def test_single_middleware_wraps_transport() -> None:
77+
"""One middleware sees the request, calls next, returns the transport's response unchanged."""
78+
seen: list[Request] = []
79+
80+
class Tap:
81+
async def __call__(self, request: Request, next: Next) -> Response: # noqa: A002
82+
seen.append(request)
83+
return await next(request)
84+
85+
transport = _OkTransport()
86+
request = _make_request()
87+
88+
response = await compose([Tap()], transport)(request)
89+
90+
assert seen == [request]
91+
assert response.content == b"transport"

0 commit comments

Comments
 (0)