Merge branch 'main' of https://github.com/docarray/docarray into pyda…

…ntic-v2-dynamic-schema Signed-off-by: Joan Fontanals Martinez <joan.martinez@jina.ai>
JoanFM · Sep 28, 2023 · Sep 18, 2023 · Sep 18, 2023 · Sep 18, 2023 · Sep 27, 2023
commit cfb150e9a9a839211fb845393763b707558cd67a
diff --git a/tests/units/util/test_create_dynamic_code_class.py b/tests/units/util/test_create_dynamic_code_class.py
@@ -11,6 +11,8 @@
     create_base_doc_from_schema,
     create_pure_python_type_model,
 )
+from docarray.utils._internal.pydantic import is_pydantic_v2
+
 
 @pytest.mark.parametrize('transformation', ['proto', 'json'])
 def test_create_pydantic_model_from_schema(transformation):
@@ -77,7 +79,10 @@ class CustomDoc(BaseDoc):
     assert len(custom_partial_da) == 1
     assert custom_partial_da[0].url == 'photo.jpg'
     assert custom_partial_da[0].lll == [[[40]]]
-    assert custom_partial_da[0].lu == ['3', '4']  # Union validates back to string
+    if is_pydantic_v2:
+        assert custom_partial_da[0].lu == [3, 4]
+    else:
+        assert custom_partial_da[0].lu == ['3', '4']  # Union validates back to string
     assert custom_partial_da[0].fff == [[[40.2]]]
     assert custom_partial_da[0].di == {'a': 2}
     assert custom_partial_da[0].d == {'b': 'a'}
@@ -96,7 +101,10 @@ class CustomDoc(BaseDoc):
     assert len(original_back) == 1
     assert original_back[0].url == 'photo.jpg'
     assert original_back[0].lll == [[[40]]]
-    assert original_back[0].lu == ['3', '4']  # Union validates back to string
+    if is_pydantic_v2:
+        assert original_back[0].lu == [3, 4]  # Union validates back to string
+    else:
+        assert original_back[0].lu == ['3', '4']  # Union validates back to string
     assert original_back[0].fff == [[[40.2]]]
     assert original_back[0].di == {'a': 2}
     assert original_back[0].d == {'b': 'a'}