Skip to content

Commit af8a246

Browse files
committed
refactor(decoders): PydanticDecoder uses per-instance adapter cache
1 parent 4a2c7fd commit af8a246

2 files changed

Lines changed: 28 additions & 32 deletions

File tree

‎src/httpware/decoders/pydantic.py‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""PydanticDecoder — module-level cached TypeAdapter adapter for ResponseDecoder.
1+
"""PydanticDecoder — ResponseDecoder backed by per-instance TypeAdapter cache.
22
33
Requires the `pydantic` extra: `pip install httpware[pydantic]`. Constructing
44
`PydanticDecoder()` directly when pydantic is not installed raises ImportError.
@@ -7,7 +7,7 @@ class entirely when `is_pydantic_installed` is False, so `AsyncClient()` does
77
not trip the ImportError when the user is not using `response_model=`.
88
"""
99

10-
import functools
10+
import typing
1111
from typing import TypeVar
1212

1313
from pydantic import TypeAdapter
@@ -22,36 +22,41 @@ class entirely when `is_pydantic_installed` is False, so `AsyncClient()` does
2222
T = TypeVar("T")
2323

2424

25-
@functools.lru_cache(maxsize=1024)
26-
def _get_adapter(model: type[T]) -> "TypeAdapter[T]":
27-
return TypeAdapter(model)
28-
29-
3025
class PydanticDecoder:
31-
"""Decode raw response bytes into `model` via a cached `pydantic.TypeAdapter`."""
26+
"""Decode raw response bytes into `model` via a per-instance cached `pydantic.TypeAdapter`."""
27+
28+
_adapters: dict[type, TypeAdapter[typing.Any]]
3229

3330
def __init__(self) -> None:
3431
if not import_checker.is_pydantic_installed:
3532
raise ImportError(MISSING_DEPENDENCY_MESSAGE)
33+
self._adapters = {}
34+
35+
def _get_adapter(self, model: type[T]) -> "TypeAdapter[T]":
36+
adapter = self._adapters.get(model)
37+
if adapter is None:
38+
adapter = TypeAdapter(model)
39+
self._adapters[model] = adapter
40+
return adapter
3641

3742
def can_decode(self, model: type) -> bool:
3843
"""Return True iff pydantic can build a schema for `model`.
3944
40-
Cached via `_get_adapter`; subsequent calls (including `decode`) reuse
41-
the same `TypeAdapter` instance. Rejects `msgspec.Struct` subclasses —
45+
Probes via `_get_adapter`; subsequent calls (including `decode`) reuse
46+
the cached `TypeAdapter`. Rejects `msgspec.Struct` subclasses —
4247
pydantic raises `PydanticSchemaGenerationError` (a `TypeError`) when
4348
building a schema for them.
4449
"""
4550
try:
46-
_get_adapter(model)
51+
self._get_adapter(model)
4752
except Exception: # noqa: BLE001 — can_decode is a probe; any failure means no
4853
return False
4954
return True
5055

5156
def decode(self, content: bytes, model: type[T]) -> T:
5257
"""Validate `content` as JSON against `model` in a single parse pass."""
5358
try:
54-
adapter = _get_adapter(model)
59+
adapter = self._get_adapter(model)
5560
except TypeError:
5661
adapter = TypeAdapter(model)
5762
return adapter.validate_json(content)

‎tests/test_decoders_pydantic.py‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import pytest
1111

1212
from httpware import ResponseDecoder
13-
from httpware.decoders.pydantic import PydanticDecoder, _get_adapter
13+
from httpware.decoders.pydantic import PydanticDecoder
1414

1515

1616
class User(pydantic.BaseModel):
@@ -28,11 +28,6 @@ class UserDC:
2828
name: str
2929

3030

31-
@pytest.fixture(autouse=True)
32-
def _clear_adapter_cache() -> None:
33-
_get_adapter.cache_clear()
34-
35-
3631
def test_pydantic_decoder_satisfies_response_decoder_protocol() -> None:
3732
assert isinstance(PydanticDecoder(), ResponseDecoder)
3833

@@ -90,7 +85,6 @@ def test_validation_error_surfaces_unchanged() -> None:
9085

9186

9287
def test_cache_invariance_single_model() -> None:
93-
_get_adapter.cache_clear()
9488
with patch("httpware.decoders.pydantic.TypeAdapter", wraps=pydantic.TypeAdapter) as spy:
9589
decoder = PydanticDecoder()
9690
for _ in range(1000):
@@ -99,7 +93,6 @@ def test_cache_invariance_single_model() -> None:
9993

10094

10195
def test_cache_invariance_two_distinct_models() -> None:
102-
_get_adapter.cache_clear()
10396
with patch("httpware.decoders.pydantic.TypeAdapter", wraps=pydantic.TypeAdapter) as spy:
10497
decoder = PydanticDecoder()
10598
for _ in range(500):
@@ -109,7 +102,6 @@ def test_cache_invariance_two_distinct_models() -> None:
109102

110103

111104
async def test_cache_invariance_concurrent_first_calls() -> None:
112-
_get_adapter.cache_clear()
113105
with patch("httpware.decoders.pydantic.TypeAdapter", wraps=pydantic.TypeAdapter) as spy:
114106
decoder = PydanticDecoder()
115107

@@ -121,7 +113,6 @@ async def one_decode() -> User:
121113

122114

123115
def test_cache_invariance_concurrent_first_calls_threadpool() -> None:
124-
_get_adapter.cache_clear()
125116
n_workers = 20
126117
with patch("httpware.decoders.pydantic.TypeAdapter", wraps=pydantic.TypeAdapter) as spy:
127118
decoder = PydanticDecoder()
@@ -133,9 +124,10 @@ def one_decode(_: int) -> User:
133124
results = list(pool.map(one_decode, range(50)))
134125

135126
assert all(type(r) is User and r.id == 1 for r in results)
136-
# functools.lru_cache serializes the cache slot but the user function runs
137-
# outside the lock — concurrent first-callers may both build a TypeAdapter
138-
# before one wins (idempotent; loser is GC'd). Bounded by worker count.
127+
# `dict` reads/writes are atomic in CPython but the get→set sequence in
128+
# `_get_adapter` is not — concurrent first-callers may both build a
129+
# TypeAdapter before one wins (idempotent; loser is GC'd). Bounded by
130+
# worker count.
139131
assert 1 <= spy.call_count <= n_workers
140132

141133

@@ -144,10 +136,11 @@ def test_unhashable_model_falls_back_to_uncached_adapter() -> None:
144136
145137
When `_get_adapter` raises `TypeError` (e.g., `Annotated[int, unhashable_metadata]`),
146138
`decode` bypasses the cache so `pydantic.ValidationError` surfaces cleanly instead
147-
of leaking a `functools`-internal `TypeError` to the caller.
139+
of leaking a `TypeError` to the caller.
148140
"""
149-
with patch(
150-
"httpware.decoders.pydantic._get_adapter",
141+
with patch.object(
142+
PydanticDecoder,
143+
"_get_adapter",
151144
side_effect=TypeError("unhashable type"),
152145
):
153146
result = PydanticDecoder().decode(b"42", int)
@@ -213,10 +206,8 @@ def test_pydantic_rejects_msgspec_struct() -> None:
213206

214207

215208
def test_pydantic_can_decode_uses_cache() -> None:
216-
_get_adapter.cache_clear()
217209
decoder = PydanticDecoder()
218210
decoder.can_decode(User)
219211
decoder.can_decode(User)
220-
info = _get_adapter.cache_info()
221-
assert info.hits >= 1
222-
assert info.misses == 1
212+
assert len(decoder._adapters) == 1 # noqa: SLF001
213+
assert User in decoder._adapters # noqa: SLF001

0 commit comments

Comments
 (0)