Skip to content

Commit 7157a7e

Browse files
committed
fix: support intermediate pydantic-ai message mapping
1 parent e32352f commit 7157a7e

2 files changed

Lines changed: 50 additions & 2 deletions

File tree

‎codewiki/src/be/llm_services.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,16 @@ def _prompt_caching_active(self) -> bool:
152152
async def _map_messages(self, messages, model_request_parameters=None, *, model_settings=None):
153153
base = OpenAIChatModel._map_messages
154154
base_params = set(inspect.signature(base).parameters)
155-
if "model_request_parameters" in base_params:
155+
if "model_settings" in base_params:
156156
openai_messages = await super()._map_messages(
157157
messages, model_request_parameters, model_settings=model_settings
158158
)
159+
elif "model_request_parameters" in base_params:
160+
# Intermediate pydantic-ai versions accept request parameters but
161+
# predate the keyword-only model_settings argument.
162+
openai_messages = await super()._map_messages(messages, model_request_parameters)
159163
else:
160-
# pydantic-ai < 1.107: base _map_messages accepts only messages.
164+
# Early pydantic-ai versions accept only messages.
161165
openai_messages = await super()._map_messages(messages)
162166
if self._prompt_caching_active:
163167
# Breakpoint 1: last system/developer message (covers tools + system).

‎tests/test_prompt_caching.py‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,50 @@ def _map(model: CachingOpenAIModel) -> list:
5757
)
5858

5959

60+
def test_map_messages_adapts_to_all_base_signatures():
61+
"""Forward only the arguments supported by each pydantic-ai API era."""
62+
model = _make_model(prompt_caching=False)
63+
history = _history()
64+
request_parameters = ModelRequestParameters()
65+
model_settings = {"temperature": 0}
66+
calls = []
67+
68+
async def one_argument(self, messages):
69+
calls.append(("one", messages))
70+
return []
71+
72+
async def two_arguments(self, messages, model_request_parameters):
73+
calls.append(("two", messages, model_request_parameters))
74+
return []
75+
76+
async def three_arguments(
77+
self, messages, model_request_parameters, *, model_settings=None
78+
):
79+
calls.append(("three", messages, model_request_parameters, model_settings))
80+
return []
81+
82+
original = OpenAIChatModel._map_messages
83+
try:
84+
for base_method in (one_argument, two_arguments, three_arguments):
85+
OpenAIChatModel._map_messages = base_method
86+
result = asyncio.run(
87+
model._map_messages(
88+
history,
89+
request_parameters,
90+
model_settings=model_settings,
91+
)
92+
)
93+
assert result == []
94+
finally:
95+
OpenAIChatModel._map_messages = original
96+
97+
assert calls == [
98+
("one", history),
99+
("two", history, request_parameters),
100+
("three", history, request_parameters, model_settings),
101+
]
102+
103+
60104
def test_injects_breakpoints_on_system_and_final_message():
61105
_CACHE_UNSUPPORTED.clear()
62106
messages = _map(_make_model())

0 commit comments

Comments
 (0)