fix: multiple field annotations bug fixed.

Author: dapper91

pydantic_xml/fields.py

@@ -40,13 +40,41 @@ class XmlEntityInfoP(typing.Protocol):
     wrapped: Optional['XmlEntityInfoP']
 
 
-class XmlEntityInfo(pd.fields.FieldInfo):
+class XmlEntityInfo(pd.fields.FieldInfo, XmlEntityInfoP):
     """
     Field xml meta-information.
     """
 
     __slots__ = ('location', 'path', 'ns', 'nsmap', 'nillable', 'wrapped')
 
+    @staticmethod
+    def merge_field_infos(*field_infos: pd.fields.FieldInfo, **overrides: Any) -> pd.fields.FieldInfo:
+        location, path, ns, nsmap, nillable, wrapped = None, None, None, None, None, None
+
+        for field_info in field_infos:
+            if isinstance(field_info, XmlEntityInfo):
+                location = field_info.location if field_info.location is not None else location
+                path = field_info.path if field_info.path is not None else path
+                ns = field_info.ns if field_info.ns is not None else ns
+                nsmap = field_info.nsmap if field_info.nsmap is not None else nsmap
+                nillable = field_info.nillable if field_info.nillable is not None else nillable
+                wrapped = field_info.wrapped if field_info.wrapped is not None else wrapped
+
+        field_info = pd.fields.FieldInfo.merge_field_infos(*field_infos, **overrides)
+
+        xml_entity_info = XmlEntityInfo(
+            location,
+            path=path,
+            ns=ns,
+            nsmap=nsmap,
+            nillable=nillable,
+            wrapped=wrapped if isinstance(wrapped, XmlEntityInfo) else None,
+            **field_info._attributes_set,
+        )
+        xml_entity_info.metadata = field_info.metadata
+
+        return xml_entity_info
+
     def __init__(
             self,
             location: Optional[EntityLocation],
@@ -58,10 +86,13 @@ def __init__(
             wrapped: Optional[pd.fields.FieldInfo] = None,
             **kwargs: Any,
     ):
+        wrapped_metadata: list[Any] = []
         if wrapped is not None:
             # copy arguments from the wrapped entity to let pydantic know how to process the field
             for entity_field_name in utils.get_slots(wrapped):
-                kwargs[entity_field_name] = getattr(wrapped, entity_field_name)
+                if entity_field_name in pd.fields._FIELD_ARG_NAMES:
+                    kwargs[entity_field_name] = getattr(wrapped, entity_field_name)
+            wrapped_metadata = wrapped.metadata
 
         if kwargs.get('serialization_alias') is None:
             kwargs['serialization_alias'] = kwargs.get('alias')
@@ -70,6 +101,8 @@ def __init__(
             kwargs['validation_alias'] = kwargs.get('alias')
 
         super().__init__(**kwargs)
+        self.metadata.extend(wrapped_metadata)
+
         self.location = location
         self.path = path
         self.ns = ns
@@ -168,7 +201,7 @@ def wrapped(
 
 
 @dc.dataclass
-class ComputedXmlEntityInfo(pd.fields.ComputedFieldInfo):
+class ComputedXmlEntityInfo(pd.fields.ComputedFieldInfo, XmlEntityInfoP):
     """
     Computed field xml meta-information.
     """

tests/test_misc.py

@@ -1,10 +1,12 @@
+import sys
 from typing import Dict, List, Optional, Tuple, Union
 
 import pydantic as pd
 import pytest
 from helpers import assert_xml_equal
 
 from pydantic_xml import BaseXmlModel, RootXmlModel, attr, element, errors, wrapped
+from pydantic_xml.fields import XmlEntityInfo
 
 
 def test_xml_declaration():
@@ -377,3 +379,30 @@ def validate_field(cls, v: str, info: pd.FieldValidationInfo):
     '''
 
     TestModel.from_xml(xml, validation_context)
+
+
+@pytest.mark.skipif(sys.version_info < (3, 9), reason="requires python 3.9 and above")
+def test_field_info_merge():
+    from typing import Annotated
+
+    from annotated_types import Ge, Lt
+
+    class TestModel(BaseXmlModel, tag='root'):
+        element1: Annotated[
+            int,
+            pd.Field(ge=0),
+            pd.Field(default=0, lt=100),
+            element(nillable=True),
+        ] = element(tag='elm', lt=10)
+
+    field_info = TestModel.model_fields['element1']
+    assert isinstance(field_info, XmlEntityInfo)
+    assert field_info.metadata == [Ge(ge=0), Lt(lt=10)]
+    assert field_info.default == 0
+    assert field_info.nillable == True
+    assert field_info.path == 'elm'
+
+    TestModel.from_xml("<root><elm>0</elm></root>")
+
+    with pytest.raises(pd.ValidationError):
+        TestModel.from_xml("<root><elm>-1</elm></root>")

tests/test_wrapped.py

@@ -1,5 +1,7 @@
 from typing import Dict, List, Optional
 
+import pydantic as pd
+import pytest
 from helpers import assert_xml_equal
 
 from pydantic_xml import BaseXmlModel, RootXmlModel, attr, element, wrapped
@@ -28,6 +30,30 @@ class TestModel(BaseXmlModel, tag='model1'):
     assert_xml_equal(actual_xml, xml)
 
 
+@pytest.mark.parametrize(
+    'value, field_gt, wrapped_gt, should_fail',
+    [
+        (1, 1, 0, True),
+        (1, 1, None, True),
+        (1, None, 1, True),
+        (1, 0, 1, False),
+    ],
+)
+def test_wrapped_field(value: int, field_gt: Optional[int], wrapped_gt: Optional[int], should_fail: bool):
+    class TestModel(BaseXmlModel, tag='model1'):
+        data: int = wrapped('model2', pd.Field(gt=field_gt), gt=wrapped_gt)
+
+    xml = f'''
+    <model1><model2>{value}</model2></model1>
+    '''
+
+    if should_fail:
+        with pytest.raises(pd.ValidationError):
+            TestModel.from_xml(xml)
+    else:
+        TestModel.from_xml(xml)
+
+
 def test_wrapped_path_merge():
     class TestModel(BaseXmlModel, tag='model1'):
         element0: int = element(tag='element0')