rename

Author: sydney-runkle

python/pydantic_core/core_schema.py

@@ -3964,7 +3964,7 @@ def definition_reference_schema(
     'no_such_attribute',
     'json_invalid',
     'json_type',
-    'cannot_validate_from_json',
+    'needs_python_object',
     'recursion_loop',
     'missing',
     'frozen_field',

src/errors/types.rs

@@ -167,7 +167,7 @@ error_types! {
         error: {ctx_type: String, ctx_fn: field_from_context},
     },
     JsonType {},
-    CannotValidateFromJson { method_name: {ctx_type: String, ctx_fn: field_from_context} },
+    NeedsPythonObject { method_name: {ctx_type: String, ctx_fn: field_from_context} },
     // ---------------------
     // recursion error
     RecursionLoop {},
@@ -478,7 +478,7 @@ impl ErrorType {
             Self::NoSuchAttribute {..} => "Object has no attribute '{attribute}'",
             Self::JsonInvalid {..} => "Invalid JSON: {error}",
             Self::JsonType {..} => "JSON input should be string, bytes or bytearray",
-            Self::CannotValidateFromJson {..} => "Cannot check `{method_name}` when validating from json, use a JsonOrPython validator instead",
+            Self::NeedsPythonObject {..} => "Cannot check `{method_name}` when validating from json, use a JsonOrPython validator instead",
             Self::RecursionLoop {..} => "Recursion error - cyclic reference detected",
             Self::Missing {..} => "Field required",
             Self::FrozenField {..} => "Field is frozen",
@@ -628,7 +628,7 @@ impl ErrorType {
         match self {
             Self::NoSuchAttribute { attribute, .. } => render!(tmpl, attribute),
             Self::JsonInvalid { error, .. } => render!(tmpl, error),
-            Self::CannotValidateFromJson { method_name, .. } => render!(tmpl, method_name),
+            Self::NeedsPythonObject { method_name, .. } => render!(tmpl, method_name),
             Self::GetAttributeError { error, .. } => render!(tmpl, error),
             Self::ModelType { class_name, .. } => render!(tmpl, class_name),
             Self::DataclassType { class_name, .. } => render!(tmpl, class_name),

src/validators/is_instance.rs

@@ -57,7 +57,7 @@ impl Validator for IsInstanceValidator {
         let Some(obj) = input.as_python() else {
             let method_name = "isinstance".to_string();
             return Err(ValError::new(
-                ErrorType::CannotValidateFromJson {
+                ErrorType::NeedsPythonObject {
                     context: None,
                     method_name,
                 },

src/validators/is_subclass.rs

@@ -52,7 +52,7 @@ impl Validator for IsSubclassValidator {
         let Some(obj) = input.as_python() else {
             let method_name = "issubclass".to_string();
             return Err(ValError::new(
-                ErrorType::CannotValidateFromJson {
+                ErrorType::NeedsPythonObject {
                     context: None,
                     method_name,
                 },

tests/test_errors.py

@@ -258,7 +258,7 @@ def f(input_value, info):
     ('json_invalid', 'Invalid JSON: foobar', {'error': 'foobar'}),
     ('json_type', 'JSON input should be string, bytes or bytearray', None),
     (
-        'cannot_validate_from_json',
+        'needs_python_object',
         'Cannot check `isinstance` when validating from json, use a JsonOrPython validator instead',
         {'method_name': 'isinstance'},
     ),
@@ -511,7 +511,7 @@ def test_all_errors():
             'example_context': None,
         },
         {
-            'type': 'cannot_validate_from_json',
+            'type': 'needs_python_object',
             'message_template_python': 'Cannot check `{method_name}` when validating from json, use a JsonOrPython validator instead',
             'example_message_python': 'Cannot check `` when validating from json, use a JsonOrPython validator instead',
             'example_context': {'method_name': ''},

tests/validators/test_is_instance.py

@@ -21,7 +21,7 @@ def test_validate_json() -> None:
     v = SchemaValidator({'type': 'is-instance', 'cls': Foo})
     with pytest.raises(ValidationError) as exc_info:
         v.validate_json('"foo"')
-        assert exc_info.value.errors()[0]['type'] == 'cannot_validate_from_json'
+        assert exc_info.value.errors()[0]['type'] == 'needs_python_object'
 
 
 def test_is_instance():
@@ -178,7 +178,7 @@ def test_is_instance_json_type_before_validator():
 
     with pytest.raises(ValidationError) as exc_info:
         v.validate_json('null')
-        assert exc_info.value.errors()[0]['type'] == 'cannot_validate_from_json'
+        assert exc_info.value.errors()[0]['type'] == 'needs_python_object'
 
     # now wrap in a before validator
     def set_type_to_int(input: None) -> type:

tests/validators/test_is_subclass.py

@@ -83,4 +83,4 @@ def test_is_subclass_json() -> None:
     v = SchemaValidator(core_schema.is_subclass_schema(Foo))
     with pytest.raises(ValidationError) as exc_info:
         v.validate_json("'Foo'")
-        assert exc_info.value.errors()[0]['type'] == 'cannot_validate_from_json'
+        assert exc_info.value.errors()[0]['type'] == 'needs_python_object'