remove default argument from …

Author: commonism

src/aiopenapi3/model.py

@@ -113,7 +113,6 @@ class _PropertyInfo:
     type_: str
 
     root: Any = None
-    anno: pydantic.Field = None
     config: dict[str, Any] = dataclasses.field(default_factory=dict)
     properties: dict[str, _PropertyInfo] = dataclasses.field(
         default_factory=lambda: collections.defaultdict(lambda: _ClassInfo._PropertyInfo())
@@ -258,17 +257,10 @@ def collapse(cls, type_name, items: list["_ClassInfo"]) -> type[BaseModel]:
         r = [i.model() for i in items]
 
         if len(r) > 1:
-            # Annotations are collected, last element has all of them
-            #            ru: object = Annotated[Union[tuple(r)], items[-1].anno]
-            v = list()
-            for i in range(len(items)):
-                v.append(Annotated[r[i], items[i].anno])
-            ru = Annotated[Union[tuple(v)], Field(default=None)]
+            ru = Annotated[Union[tuple(r)], Field(default=None)]
             m: type[RootModel] = create_model(type_name, __base__=(ConfiguredRootModel[ru],), __module__=me.__name__)
         elif len(r) == 1:
             m: type[BaseModel] = cast(type[BaseModel], r[0])
-            if items[0].anno:
-                m = Annotated[m, items[0].anno]
             if not is_basemodel(m):
                 m = create_model(type_name, __base__=(ConfiguredRootModel[m],), __module__=me.__name__)
         else:  # == 0
@@ -336,8 +328,10 @@ def createClassInfo(
             for primitive types the anyOf/oneOf is taken care of in Model.createAnnotation
             """
             if typing.get_origin(_t := Model.createAnnotation(schema, _type=_type)) != Literal:
-                classinfo.anno = Model.createField(schema, _type=_type, args=args)
-            classinfo.root = _t
+                classinfo.root = Annotated[_t, Model.createField(schema, _type=_type, args=args)]
+            else:
+                classinfo.root = _t
+
         elif _type == "array":
             """anyOf/oneOf is taken care in in createAnnotation"""
             classinfo.root = Model.createAnnotation(schema, _type="array")
@@ -364,8 +358,10 @@ def createClassInfo(
                     if _type in Model.types(i)
                 )
                 if schema.discriminator and schema.discriminator.mapping:
-                    classinfo.root = Union[t]
-                    classinfo.anno = Field(discriminator=Model.nameof(schema.discriminator.propertyName))
+                    classinfo.root = Annotated[
+                        Union[t], Field(discriminator=Model.nameof(schema.discriminator.propertyName))
+                    ]
+
                 else:
                     if len(t):
                         classinfo.root = Union[t]
@@ -381,8 +377,9 @@ def createClassInfo(
                     if _type in Model.types(i)
                 )
                 if schema.discriminator and schema.discriminator.mapping:
-                    classinfo.root = Union[t]
-                    classinfo.anno = Field(discriminator=Model.nameof(schema.discriminator.propertyName))
+                    classinfo.root = Annotated[
+                        Union[t], Field(discriminator=Model.nameof(schema.discriminator.propertyName))
+                    ]
                 else:
                     if len(t):
                         classinfo.root = Union[t]
@@ -458,8 +455,8 @@ def validate_patternProperties(self_):
             """
             assert isinstance(schema, v20.Schema)
             schema_ = v20.Schema(type="string", format="binary")
-            classinfo.root = Model.createAnnotation(schema_, _type="string")
-            classinfo.anno = Model.createField(schema_, _type="string", args=None)
+            _t = Model.createAnnotation(schema_, _type="string")
+            classinfo.root = Annotated[_t, Model.createField(schema_, _type="string", args=None)]
         else:
             raise ValueError(_type)