works

Author: commonism

src/aiopenapi3/model.py

@@ -258,8 +258,12 @@ def collapse(cls, type_name, items: list["_ClassInfo"]) -> type[BaseModel]:
         r = [i.model() for i in items]
 
         if len(r) > 1:
-            # FIXME - merge annotations
-            ru: object = Annotated[Union[tuple(r)], items[0].anno]
+            # 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)]
             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])
@@ -303,7 +307,8 @@ def from_schema(
         r: list[_ClassInfo] = list()
 
         for _type in Model.types(schema):
-            r.append(Model.createClassInfo(schema, _type, schemanames, discriminators, extra))
+            args = dict()
+            r.append(Model.createClassInfo(schema, _type, schemanames, discriminators, extra, args))
 
         m = _ClassInfo.collapse(schema._get_identity("L8"), r)
 
@@ -317,6 +322,7 @@ def createClassInfo(
         schemanames: list[str],
         discriminators: list["DiscriminatorType"],
         extra: list["SchemaType"] | None,
+        args: dict[str, Any] = None,
     ) -> _ClassInfo:
         from . import v20, v30, v31
 
@@ -330,7 +336,7 @@ 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=None)
+                classinfo.anno = Model.createField(schema, _type=_type, args=args)
             classinfo.root = _t
         elif _type == "array":
             """anyOf/oneOf is taken care in in createAnnotation"""