Update pydantic-core to latest version (pydantic#7277)

Author: adriangb

docs/usage/types/custom.md

@@ -124,7 +124,7 @@ except ValidationError as exc:
     print(exc)
     """
     1 validation error for list[int]
-      List should have at most 10 items after validation, not 11 [type=too_long, input_value=[1, 1, 1, 1, 1, 1, 1, 1, ... 1, 1, 1, 1, 1, 1, 1, 1], input_type=list]
+      List should have at most 10 items after validation, not 100 [type=too_long, input_value=[1, 1, 1, 1, 1, 1, 1, 1, ... 1, 1, 1, 1, 1, 1, 1, 1], input_type=list]
     """
 
 

pdm.lock

@@ -262,9 +262,9 @@ def handle_tuple_positional_schema(
     ) -> core_schema.CoreSchema:
         schema = cast(core_schema.TuplePositionalSchema, schema)
         schema['items_schema'] = [self.walk(v, f) for v in schema['items_schema']]
-        extra_schema = schema.get('extra_schema')
-        if extra_schema is not None:
-            schema['extra_schema'] = self.walk(extra_schema, f)
+        extras_schema = schema.get('extras_schema')
+        if extras_schema is not None:
+            schema['extras_schema'] = self.walk(extras_schema, f)
         return schema
 
     def handle_dict_schema(self, schema: core_schema.DictSchema, f: Walk) -> core_schema.CoreSchema:
@@ -314,9 +314,9 @@ def handle_json_or_python_schema(self, schema: core_schema.JsonOrPythonSchema, f
         return schema
 
     def handle_model_fields_schema(self, schema: core_schema.ModelFieldsSchema, f: Walk) -> core_schema.CoreSchema:
-        extra_validator = schema.get('extra_validator')
-        if extra_validator is not None:
-            schema['extra_validator'] = self.walk(extra_validator, f)
+        extras_schema = schema.get('extras_schema')
+        if extras_schema is not None:
+            schema['extras_schema'] = self.walk(extras_schema, f)
         replaced_fields: dict[str, core_schema.ModelField] = {}
         replaced_computed_fields: list[core_schema.ComputedField] = []
         for computed_field in schema.get('computed_fields', ()):
@@ -333,9 +333,9 @@ def handle_model_fields_schema(self, schema: core_schema.ModelFieldsSchema, f: W
         return schema
 
     def handle_typed_dict_schema(self, schema: core_schema.TypedDictSchema, f: Walk) -> core_schema.CoreSchema:
-        extra_validator = schema.get('extra_validator')
-        if extra_validator is not None:
-            schema['extra_validator'] = self.walk(extra_validator, f)
+        extras_schema = schema.get('extras_schema')
+        if extras_schema is not None:
+            schema['extras_schema'] = self.walk(extras_schema, f)
         replaced_computed_fields: list[core_schema.ComputedField] = []
         for computed_field in schema.get('computed_fields', ()):
             replaced_field = computed_field.copy()

pydantic/_internal/_core_utils.py

@@ -481,7 +481,7 @@ def _model_schema(self, cls: type[BaseModel]) -> core_schema.CoreSchema:
 
             model_validators = decorators.model_validators.values()
 
-            extra_validator = None
+            extras_schema = None
             if core_config.get('extra_fields_behavior') == 'allow':
                 for tp in (cls, *cls.__mro__):
                     extras_annotation = cls.__annotations__.get('__pydantic_extra__', None)
@@ -496,7 +496,7 @@ def _model_schema(self, cls: type[BaseModel]) -> core_schema.CoreSchema:
                             required=True,
                         )[1]
                         if extra_items_type is not Any:
-                            extra_validator = self.generate_schema(extra_items_type)
+                            extras_schema = self.generate_schema(extra_items_type)
                             break
 
             with self._config_wrapper_stack.push(config_wrapper):
@@ -522,7 +522,7 @@ def _model_schema(self, cls: type[BaseModel]) -> core_schema.CoreSchema:
                             self._computed_field_schema(d, decorators.field_serializers)
                             for d in computed_fields.values()
                         ],
-                        extra_validator=extra_validator,
+                        extras_schema=extras_schema,
                         model_name=cls.__name__,
                     )
                     inner_schema = apply_validators(fields_schema, decorators.root_validators.values(), None)

pydantic/_internal/_generate_schema.py

@@ -795,8 +795,8 @@ def tuple_positional_schema(self, schema: core_schema.TuplePositionalSchema) ->
         prefixItems = [self.generate_inner(item) for item in schema['items_schema']]
         if prefixItems:
             json_schema['prefixItems'] = prefixItems
-        if 'extra_schema' in schema:
-            json_schema['items'] = self.generate_inner(schema['extra_schema'])
+        if 'extras_schema' in schema:
+            json_schema['items'] = self.generate_inner(schema['extras_schema'])
         else:
             json_schema['maxItems'] = len(schema['items_schema'])
         self.update_with_validations(json_schema, schema, self.ValidationsMapping.array)
@@ -1383,10 +1383,10 @@ def model_fields_schema(self, schema: core_schema.ModelFieldsSchema) -> JsonSche
         if self.mode == 'serialization':
             named_required_fields.extend(self._name_required_computed_fields(schema.get('computed_fields', [])))
         json_schema = self._named_required_fields_schema(named_required_fields)
-        extra_validator = schema.get('extra_validator', None)
-        if extra_validator is not None:
+        extras_schema = schema.get('extras_schema', None)
+        if extras_schema is not None:
             schema_to_update = self.resolve_schema_to_update(json_schema)
-            schema_to_update['additionalProperties'] = self.generate_inner(extra_validator)
+            schema_to_update['additionalProperties'] = self.generate_inner(extras_schema)
         return json_schema
 
     def field_is_present(self, field: CoreSchemaField) -> bool:

pydantic/json_schema.py

@@ -161,9 +161,9 @@ def __new__(mcs, name, bases, namespace, **kwargs):  # noqa C901
 
         for f in fields.values():
             f.set_config(config)
-            extra_validators = vg.get_validators(f.name)
-            if extra_validators:
-                f.class_validators.update(extra_validators)
+            extras_schemas = vg.get_validators(f.name)
+            if extras_schemas:
+                f.class_validators.update(extras_schemas)
                 # re-run prepare to add extra validators
                 f.populate_validators()
 

pydantic/v1/main.py

@@ -61,7 +61,7 @@ requires-python = '>=3.7'
 dependencies = [
     'typing-extensions>=4.6.1',
     'annotated-types>=0.4.0',
-    "pydantic-core==2.6.3",
+    "pydantic-core==2.7.0",
 ]
 dynamic = ['version', 'readme']
 

pyproject.toml

@@ -2475,7 +2475,7 @@ class MyTuple(Tuple[int, str]):
         @classmethod
         def __get_pydantic_core_schema__(cls, _source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
             return core_schema.tuple_positional_schema(
-                [core_schema.int_schema(), core_schema.str_schema()], extra_schema=core_schema.int_schema()
+                [core_schema.int_schema(), core_schema.str_schema()], extras_schema=core_schema.int_schema()
             )
 
     class Model(BaseModel):

tests/test_json_schema.py

@@ -547,8 +547,8 @@ def test_camel2snake(value: str, result: str) -> None:
     (
         pytest.param({}, {}, id='Positional tuple without extra_schema'),
         pytest.param(
-            {'extra_schema': core_schema.float_schema()},
-            {'extra_schema': {'type': 'str'}},
+            {'extras_schema': core_schema.float_schema()},
+            {'extras_schema': {'type': 'str'}},
             id='Positional tuple with extra_schema',
         ),
     ),
@@ -575,8 +575,8 @@ def walk(s, recurse):
     (
         pytest.param({}, {}, id='Model fields without extra_validator'),
         pytest.param(
-            {'extra_validator': core_schema.float_schema()},
-            {'extra_validator': {'type': 'str'}},
+            {'extras_schema': core_schema.float_schema()},
+            {'extras_schema': {'type': 'str'}},
             id='Model fields with extra_validator',
         ),
     ),
@@ -608,8 +608,8 @@ def walk(s, recurse):
     (
         pytest.param({}, {}, id='Typeddict without extra_validator'),
         pytest.param(
-            {'extra_validator': core_schema.float_schema()},
-            {'extra_validator': {'type': 'str'}},
+            {'extras_schema': core_schema.float_schema()},
+            {'extras_schema': {'type': 'str'}},
             id='Typeddict with extra_validator',
         ),
     ),