Fix field of a type that has a default value

changes/880-koxudaxi.md

@@ -0,0 +1 @@
+Fix field of a type that has a default value.

pydantic/main.py

@@ -18,7 +18,7 @@
 from .schema import model_schema
 from .types import PyObject, StrBytes
 from .typing import AnyCallable, AnyType, ForwardRef, is_classvar, resolve_annotations, update_field_forward_refs
-from .utils import GetterDict, ValueItems, truncate, validate_field_name
+from .utils import GetterDict, ValueItems, lenient_issubclass, truncate, validate_field_name
 
 if TYPE_CHECKING:
     from .class_validators import ValidatorListDict
@@ -175,7 +175,11 @@ def __new__(mcs, name, bases, namespace, **kwargs):
                 elif is_valid_field(ann_name):
                     validate_field_name(bases, ann_name)
                     value = namespace.get(ann_name, ...)
-                    if isinstance(value, untouched_types) and ann_type != PyObject:
+                    if (
+                        isinstance(value, untouched_types)
+                        and ann_type != PyObject
+                        and not lenient_issubclass(getattr(ann_type, '__origin__', None), Type)
+                    ):
                         continue
                     fields[ann_name] = ModelField.infer(
                         name=ann_name,

tests/test_edge_cases.py

@@ -1,7 +1,7 @@
 import re
 from decimal import Decimal
 from enum import Enum
-from typing import Any, Dict, List, Optional, Set, Tuple, Union
+from typing import Any, Dict, List, Optional, Set, Tuple, Type, Union
 
 import pytest
 
@@ -957,15 +957,19 @@ def __init__(self, **data) -> None:
     Foobar(x=1)
 
 
-def test_ignored_type():
-    def foobar():
+def test_type_on_annotation():
+    class FooBar:
         pass
 
     class Model(BaseModel):
-        a: int = foobar
-        b: int
-
-    assert Model.__fields__.keys() == {'b'}
+        a: int = int
+        b: Type[int]
+        c: Type[int] = int
+        d: FooBar = FooBar
+        e: Type[FooBar]
+        f: Type[FooBar] = FooBar
+
+    assert Model.__fields__.keys() == {'b', 'c', 'e', 'f'}
 
 
 def test_optional_subfields():