Retain defaults in non-strict openai schemas (#1519)

Co-authored-by: Douwe Maan <[email protected]>

Author: dmontagu

pydantic_ai_slim/pydantic_ai/profiles/openai.py

@@ -93,10 +93,18 @@ def walk(self) -> JsonSchema:
     def transform(self, schema: JsonSchema) -> JsonSchema:  # noqa C901
         # Remove unnecessary keys
         schema.pop('title', None)
-        schema.pop('default', None)
         schema.pop('$schema', None)
         schema.pop('discriminator', None)
 
+        default = schema.get('default', _sentinel)
+        if default is not _sentinel:
+            # the "default" keyword is not allowed in strict mode, but including it makes some Ollama models behave
+            # better, so we keep it around when not strict
+            if self.strict is True:
+                schema.pop('default', None)
+            elif self.strict is None:  # pragma: no branch
+                self.is_strict_compatible = False
+
         if schema_ref := schema.get('$ref'):
             if schema_ref == self.root_ref:
                 schema['$ref'] = '#'

tests/models/test_openai.py

@@ -1095,7 +1095,10 @@ def tool_with_tuples(x: tuple[int], y: tuple[str] = ('abc',)) -> str:
                     '$defs': {
                         'MyDefaultRecursiveDc': {
                             'properties': {
-                                'field': {'anyOf': [{'$ref': '#/$defs/MyDefaultRecursiveDc'}, {'type': 'null'}]}
+                                'field': {
+                                    'anyOf': [{'$ref': '#/$defs/MyDefaultRecursiveDc'}, {'type': 'null'}],
+                                    'default': None,
+                                }
                             },
                             'type': 'object',
                         },
@@ -1213,7 +1216,7 @@ def tool_with_tuples(x: tuple[int], y: tuple[str] = ('abc',)) -> str:
                 {
                     '$defs': {
                         'MyDefaultDc': {
-                            'properties': {'x': {'type': 'integer'}},
+                            'properties': {'x': {'default': 1, 'type': 'integer'}},
                             'type': 'object',
                         }
                     },
@@ -1253,7 +1256,7 @@ def tool_with_tuples(x: tuple[int], y: tuple[str] = ('abc',)) -> str:
                 {
                     '$defs': {
                         'MyDefaultDc': {
-                            'properties': {'x': {'type': 'integer'}},
+                            'properties': {'x': {'default': 1, 'type': 'integer'}},
                             'type': 'object',
                         }
                     },
@@ -1293,7 +1296,7 @@ def tool_with_tuples(x: tuple[int], y: tuple[str] = ('abc',)) -> str:
                 {
                     '$defs': {
                         'MyDefaultDc': {
-                            'properties': {'x': {'type': 'integer'}},
+                            'properties': {'x': {'default': 1, 'type': 'integer'}},
                             'type': 'object',
                         }
                     },