Commite92ad79

authored

Check ifFieldInfo is complete after applying type variable map (#11855)

1 parent944674a commite92ad79Copy full SHA for e92ad79

File tree

+33

-3

lines changed

+33

-3

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,9 @@ def rebuild_model_fields(`
`411`	`411`
`412`	`412`	`This function should be called whenever a model with incomplete fields is encountered.`
`413`	`413`
	`414`	`+ Raises:`
	`415`	`+ NameError: If one of the annotations failed to evaluate.`
	`416`	`+`
`414`	`417`	`Note:`
`415`	`418`	`This function doesn't mutate the model fields in place, as it can be called during`
`416`	`419`	`schema generation, where you don't want to mutate other model's fields.`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -693,8 +693,12 @@ def apply_typevars_map(`
`693`	`693`	`pydantic._internal._generics.replace_types is used for replacing the typevars with`
`694`	`694`	`their concrete types.`
`695`	`695`	`"""`
`696`		`-annotation,_=_typing_extra.try_eval_type(self.annotation,globalns,localns)`
`697`		`-self.annotation=_generics.replace_types(annotation,typevars_map)`
	`696`	`+annotation=_generics.replace_types(self.annotation,typevars_map)`
	`697`	`+annotation,evaluated=_typing_extra.try_eval_type(annotation,globalns,localns)`
	`698`	`+self.annotation=annotation`
	`699`	`+ifnotevaluated:`
	`700`	`+self._complete=False`
	`701`	`+self._original_annotation=self.annotation`
`698`	`702`
`699`	`703`	`def__repr_args__(self)->ReprArgs:`
`700`	`704`	`yield'annotation',_repr.PlainRepr(_repr.display_as_type(self.annotation))`

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`importre`
`4`	`4`	`importsys`
`5`	`5`	`importtyping`
`6`		`-fromtypingimportAny,Optional`
	`6`	`+fromtypingimportAny,Generic,Optional,TypeVar`
`7`	`7`
`8`	`8`	`importpytest`
`9`	`9`
`@@ -1232,6 +1232,29 @@ class SubChild(Child):`
`1232`	`1232`	`)`
`1233`	`1233`
`1234`	`1234`
	`1235`	`+@pytest.mark.skipif(`
	`1236`	`+sys.version_info< (3,11),`
	`1237`	`+reason=(`
	`1238`	`+'Forward refs inside PEP 585 generics are not evaluated (see https://github.com/python/cpython/pull/30900).'`
	`1239`	`+ ),`
	`1240`	`+)`
	`1241`	`+deftest_forward_ref_in_class_parameter()->None:`
	`1242`	`+"""https://github.com/pydantic/pydantic/issues/11854"""`
	`1243`	`+T=TypeVar('T')`
	`1244`	`+`
	`1245`	`+classModel(BaseModel,Generic[T]):`
	`1246`	`+f:T`
	`1247`	`+`
	`1248`	`+M=Model[list['Undefined']]`
	`1249`	`+`
	`1250`	`+assertnotM.__pydantic_fields_complete__`
	`1251`	`+`
	`1252`	`+M.model_rebuild(_types_namespace={'Undefined':int})`
	`1253`	`+`
	`1254`	`+assertM.__pydantic_fields_complete__`
	`1255`	`+assertM.model_fields['f'].annotation==list[int]`
	`1256`	`+`
	`1257`	`+`
`1235`	`1258`	`deftest_uses_the_local_namespace_when_generating_schema():`
`1236`	`1259`	`deffunc():`
`1237`	`1260`	`A=int`

Comments

(0)