Skip to content

Commit fc4c0e2

Browse files
authored
Rename ModelResponse.provider_request_id to provider_response_id (#2710)
1 parent 248582c commit fc4c0e2

23 files changed

+216
-207
lines changed

docs/models/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ print(response.all_messages())
118118
model_name='claude-3-5-sonnet-latest',
119119
timestamp=datetime.datetime(...),
120120
kind='response',
121-
provider_request_id=None,
121+
provider_response_id=None,
122122
),
123123
]
124124
"""

pydantic_ai_slim/pydantic_ai/messages.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ class ModelResponse:
938938
For OpenAI models, this may include 'logprobs', 'finish_reason', etc.
939939
"""
940940

941-
provider_request_id: str | None = None
941+
provider_response_id: str | None = None
942942
"""request ID as specified by the model provider. This can be used to track the specific request to the model."""
943943

944944
def price(self) -> genai_types.PriceCalculation:
@@ -1026,9 +1026,14 @@ def vendor_details(self) -> dict[str, Any] | None:
10261026
return self.provider_details
10271027

10281028
@property
1029-
@deprecated('`vendor_id` is deprecated, use `provider_request_id` instead')
1029+
@deprecated('`vendor_id` is deprecated, use `provider_response_id` instead')
10301030
def vendor_id(self) -> str | None:
1031-
return self.provider_request_id
1031+
return self.provider_response_id
1032+
1033+
@property
1034+
@deprecated('`provider_request_id` is deprecated, use `provider_response_id` instead')
1035+
def provider_request_id(self) -> str | None:
1036+
return self.provider_response_id
10321037

10331038
__repr__ = _utils.dataclasses_no_defaults_repr
10341039

pydantic_ai_slim/pydantic_ai/models/anthropic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ def _process_response(self, response: BetaMessage) -> ModelResponse:
330330
items,
331331
usage=_map_usage(response),
332332
model_name=response.model,
333-
provider_request_id=response.id,
333+
provider_response_id=response.id,
334334
provider_name=self._provider.name,
335335
)
336336

pydantic_ai_slim/pydantic_ai/models/bedrock.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,13 @@ async def _process_response(self, response: ConverseResponseTypeDef) -> ModelRes
301301
input_tokens=response['usage']['inputTokens'],
302302
output_tokens=response['usage']['outputTokens'],
303303
)
304-
vendor_id = response.get('ResponseMetadata', {}).get('RequestId', None)
304+
response_id = response.get('ResponseMetadata', {}).get('RequestId', None)
305305
return ModelResponse(
306-
items, usage=u, model_name=self.model_name, provider_request_id=vendor_id, provider_name=self._provider.name
306+
items,
307+
usage=u,
308+
model_name=self.model_name,
309+
provider_response_id=response_id,
310+
provider_name=self._provider.name,
307311
)
308312

309313
@overload

pydantic_ai_slim/pydantic_ai/models/gemini.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ def _process_response_from_parts(
690690
f'Unsupported response from Gemini, expected all parts to be function calls or text, got: {part!r}'
691691
)
692692
return ModelResponse(
693-
parts=items, usage=usage, model_name=model_name, provider_request_id=vendor_id, provider_details=vendor_details
693+
parts=items, usage=usage, model_name=model_name, provider_response_id=vendor_id, provider_details=vendor_details
694694
)
695695

696696

pydantic_ai_slim/pydantic_ai/models/google.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ def _process_response_from_parts(
648648
parts=items,
649649
model_name=model_name,
650650
usage=usage,
651-
provider_request_id=vendor_id,
651+
provider_response_id=vendor_id,
652652
provider_details=vendor_details,
653653
provider_name=provider_name,
654654
)

pydantic_ai_slim/pydantic_ai/models/groq.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def _process_response(self, response: chat.ChatCompletion) -> ModelResponse:
289289
usage=_map_usage(response),
290290
model_name=response.model,
291291
timestamp=timestamp,
292-
provider_request_id=response.id,
292+
provider_response_id=response.id,
293293
provider_name=self._provider.name,
294294
)
295295

pydantic_ai_slim/pydantic_ai/models/huggingface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def _process_response(self, response: ChatCompletionOutput) -> ModelResponse:
271271
usage=_map_usage(response),
272272
model_name=response.model,
273273
timestamp=timestamp,
274-
provider_request_id=response.id,
274+
provider_response_id=response.id,
275275
provider_name=self._provider.name,
276276
)
277277

pydantic_ai_slim/pydantic_ai/models/mistral.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def _process_response(self, response: MistralChatCompletionResponse) -> ModelRes
352352
usage=_map_usage(response),
353353
model_name=response.model,
354354
timestamp=timestamp,
355-
provider_request_id=response.id,
355+
provider_response_id=response.id,
356356
provider_name=self._provider.name,
357357
)
358358

pydantic_ai_slim/pydantic_ai/models/openai.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ def _process_response(self, response: chat.ChatCompletion | str) -> ModelRespons
517517
model_name=response.model,
518518
timestamp=timestamp,
519519
provider_details=vendor_details,
520-
provider_request_id=response.id,
520+
provider_response_id=response.id,
521521
provider_name=self._provider.name,
522522
)
523523

@@ -831,7 +831,7 @@ def _process_response(self, response: responses.Response) -> ModelResponse:
831831
items,
832832
usage=_map_usage(response),
833833
model_name=response.model,
834-
provider_request_id=response.id,
834+
provider_response_id=response.id,
835835
timestamp=timestamp,
836836
provider_name=self._provider.name,
837837
)

0 commit comments

Comments
 (0)