Added 'Validator response:' prefix to default response template.

Author: hovi

docs/agents.md

@@ -852,7 +852,7 @@ with capture_run_messages() as messages:  # (2)!
                     )
                 ],
                 usage=Usage(
-                    requests=1, request_tokens=72, response_tokens=8, total_tokens=80
+                    requests=1, request_tokens=74, response_tokens=8, total_tokens=82
                 ),
                 model_name='gpt-4o',
                 timestamp=datetime.datetime(...),

pydantic_ai_slim/pydantic_ai/messages.py

@@ -423,7 +423,7 @@ def otel_event(self, _settings: InstrumentationSettings) -> Event:
 error_details_ta = pydantic.TypeAdapter(list[pydantic_core.ErrorDetails], config=pydantic.ConfigDict(defer_build=True))
 
 
-DEFAULT_MODEL_RESPONSE_TEMPLATE = '{description}\n\nFix the errors and try again.'
+DEFAULT_MODEL_RESPONSE_TEMPLATE = 'Validator response:\n{description}\n\nFix the errors and try again.'
 
 
 @dataclass(repr=False)

tests/models/test_instrumented.py

@@ -214,6 +214,7 @@ async def test_instrumented_model(capfire: CaptureLogfire):
             {
                 'body': {
                     'content': """\
+Validator response:
 retry_prompt1
 
 Fix the errors and try again.\
@@ -238,6 +239,7 @@ async def test_instrumented_model(capfire: CaptureLogfire):
             {
                 'body': {
                     'content': """\
+Validator response:
 retry_prompt2
 
 Fix the errors and try again.\
@@ -596,6 +598,7 @@ async def test_instrumented_model_attributes_mode(capfire: CaptureLogfire):
                                 {
                                     'event.name': 'gen_ai.tool.message',
                                     'content': """\
+Validator response:
 retry_prompt1
 
 Fix the errors and try again.\
@@ -609,6 +612,7 @@ async def test_instrumented_model_attributes_mode(capfire: CaptureLogfire):
                                 {
                                     'event.name': 'gen_ai.user.message',
                                     'content': """\
+Validator response:
 retry_prompt2
 
 Fix the errors and try again.\

tests/models/test_model_test.py

@@ -121,7 +121,7 @@ async def my_ret(x: int) -> str:
             ),
             ModelResponse(
                 parts=[ToolCallPart(tool_name='my_ret', args={'x': 0}, tool_call_id=IsStr())],
-                usage=Usage(requests=1, request_tokens=61, response_tokens=8, total_tokens=69),
+                usage=Usage(requests=1, request_tokens=63, response_tokens=8, total_tokens=71),
                 model_name='test',
                 timestamp=IsNow(tz=timezone.utc),
             ),
@@ -134,7 +134,7 @@ async def my_ret(x: int) -> str:
             ),
             ModelResponse(
                 parts=[TextPart(content='{"my_ret":"1"}')],
-                usage=Usage(requests=1, request_tokens=62, response_tokens=12, total_tokens=74),
+                usage=Usage(requests=1, request_tokens=64, response_tokens=12, total_tokens=76),
                 model_name='test',
                 timestamp=IsNow(tz=timezone.utc),
             ),

tests/test_agent.py

@@ -113,7 +113,7 @@ def return_model(messages: list[ModelMessage], info: AgentInfo) -> ModelResponse
             ),
             ModelResponse(
                 parts=[ToolCallPart(tool_name='final_result', args='{"a": 42, "b": "foo"}', tool_call_id=IsStr())],
-                usage=Usage(requests=1, request_tokens=87, response_tokens=14, total_tokens=101),
+                usage=Usage(requests=1, request_tokens=89, response_tokens=14, total_tokens=103),
                 model_name='function:return_model:',
                 timestamp=IsNow(tz=timezone.utc),
             ),
@@ -172,6 +172,7 @@ def check_b(cls, v: str) -> str:
     retry_prompt = user_retry.parts[0]
     assert isinstance(retry_prompt, RetryPromptPart)
     assert retry_prompt.model_response() == snapshot("""\
+Validator response:
 1 validation errors: [
   {
     "type": "value_error",
@@ -229,7 +230,7 @@ def validate_output(ctx: RunContext[None], o: Foo) -> Foo:
             ),
             ModelResponse(
                 parts=[ToolCallPart(tool_name='final_result', args='{"a": 42, "b": "foo"}', tool_call_id=IsStr())],
-                usage=Usage(requests=1, request_tokens=63, response_tokens=14, total_tokens=77),
+                usage=Usage(requests=1, request_tokens=64, response_tokens=14, total_tokens=78),
                 model_name='function:return_model:',
                 timestamp=IsNow(tz=timezone.utc),
             ),
@@ -288,7 +289,7 @@ def return_tuple(_: list[ModelMessage], info: AgentInfo) -> ModelResponse:
                 parts=[
                     ToolCallPart(tool_name='final_result', args='{"response": ["foo", "bar"]}', tool_call_id=IsStr())
                 ],
-                usage=Usage(requests=1, request_tokens=72, response_tokens=8, total_tokens=80),
+                usage=Usage(requests=1, request_tokens=74, response_tokens=8, total_tokens=82),
                 model_name='function:return_tuple:',
                 timestamp=IsNow(tz=timezone.utc),
             ),
@@ -828,7 +829,7 @@ def call_tool(messages: list[ModelMessage], info: AgentInfo) -> ModelResponse:
                         tool_call_id=IsStr(),
                     )
                 ],
-                usage=Usage(requests=1, request_tokens=68, response_tokens=13, total_tokens=81),
+                usage=Usage(requests=1, request_tokens=70, response_tokens=13, total_tokens=83),
                 model_name='function:call_tool:',
                 timestamp=IsDatetime(),
             ),
@@ -1487,7 +1488,7 @@ def empty(_: list[ModelMessage], _info: AgentInfo) -> ModelResponse:
             ),
             ModelResponse(
                 parts=[ToolCallPart(tool_name='foobar', args='{}', tool_call_id=IsStr())],
-                usage=Usage(requests=1, request_tokens=65, response_tokens=4, total_tokens=69),
+                usage=Usage(requests=1, request_tokens=67, response_tokens=4, total_tokens=71),
                 model_name='function:empty:',
                 timestamp=IsNow(tz=timezone.utc),
             ),
@@ -1527,7 +1528,7 @@ def empty(m: list[ModelMessage], _info: AgentInfo) -> ModelResponse:
             ),
             ModelResponse(
                 parts=[TextPart(content='success')],
-                usage=Usage(requests=1, request_tokens=65, response_tokens=3, total_tokens=68),
+                usage=Usage(requests=1, request_tokens=67, response_tokens=3, total_tokens=70),
                 model_name='function:empty:',
                 timestamp=IsNow(tz=timezone.utc),
             ),
@@ -2651,6 +2652,12 @@ def foo_tool(foo: Foo) -> int:
                     'tool_call_id': IsStr(),
                     'timestamp': IsStr(),
                     'part_kind': 'retry-prompt',
+                    'model_message_template': """\
+Validator response:
+{description}
+
+Fix the errors and try again.\
+""",
                 }
             ],
             'instructions': None,