Include additional usage fields from OpenAI-compatible APIs in usage details (#2038)

Author: Wh1isper

pydantic_ai_slim/pydantic_ai/models/openai.py

@@ -1062,18 +1062,29 @@ def _map_usage(response: chat.ChatCompletion | ChatCompletionChunk | responses.R
     if response_usage is None:
         return usage.Usage()
     elif isinstance(response_usage, responses.ResponseUsage):
-        details: dict[str, int] = {}
+        details: dict[str, int] = {
+            key: value
+            for key, value in response_usage.model_dump(
+                exclude={'input_tokens', 'output_tokens', 'total_tokens'}
+            ).items()
+            if isinstance(value, int)
+        }
+        details['reasoning_tokens'] = response_usage.output_tokens_details.reasoning_tokens
+        details['cached_tokens'] = response_usage.input_tokens_details.cached_tokens
         return usage.Usage(
             request_tokens=response_usage.input_tokens,
             response_tokens=response_usage.output_tokens,
             total_tokens=response_usage.total_tokens,
-            details={
-                'reasoning_tokens': response_usage.output_tokens_details.reasoning_tokens,
-                'cached_tokens': response_usage.input_tokens_details.cached_tokens,
-            },
+            details=details,
         )
     else:
-        details = {}
+        details = {
+            key: value
+            for key, value in response_usage.model_dump(
+                exclude={'prompt_tokens', 'completion_tokens', 'total_tokens'}
+            ).items()
+            if isinstance(value, int)
+        }
         if response_usage.completion_tokens_details is not None:
             details.update(response_usage.completion_tokens_details.model_dump(exclude_none=True))
         if response_usage.prompt_tokens_details is not None:

tests/models/test_deepseek.py

@@ -35,7 +35,12 @@ async def test_deepseek_model_thinking_part(allow_model_requests: None, deepseek
                     request_tokens=12,
                     response_tokens=789,
                     total_tokens=801,
-                    details={'reasoning_tokens': 415, 'cached_tokens': 0},
+                    details={
+                        'prompt_cache_hit_tokens': 0,
+                        'prompt_cache_miss_tokens': 12,
+                        'reasoning_tokens': 415,
+                        'cached_tokens': 0,
+                    },
                 ),
                 model_name='deepseek-reasoner',
                 timestamp=IsDatetime(),