test: test fixes

Joan Martinez · Joan Martinez · commit c652ed2da8f4 · 2024-03-12T16:23:17.000+01:00
diff --git a/tests/integrations/externals/test_fastapi.py b/tests/integrations/externals/test_fastapi.py
@@ -9,6 +9,7 @@
 from docarray.base_doc import DocArrayResponse
 from docarray.documents import ImageDoc, TextDoc
 from docarray.typing import NdArray
+from docarray.utils._internal.pydantic import is_pydantic_v2
 
 
 @pytest.mark.asyncio
@@ -112,6 +113,7 @@ async def create_item(doc: InputDoc) -> OutputDoc:
 
 
 @pytest.mark.asyncio
+@pytest.mark.skipif(is_pydantic_v2)
 async def test_docarray():
     doc = ImageDoc(tensor=np.zeros((3, 224, 224)))
     docs = DocList[ImageDoc]([doc, doc])
@@ -135,3 +137,29 @@ async def func(fastapi_docs: List[ImageDoc]) -> List[ImageDoc]:
     docs = DocList[ImageDoc].from_json(response.content.decode())
     assert len(docs) == 2
     assert docs[0].tensor.shape == (3, 224, 224)
+
+
+@pytest.mark.asyncio
+@pytest.mark.skipif(is_pydantic_v2)
+async def test_doclist_directly():
+    doc = ImageDoc(tensor=np.zeros((3, 224, 224)))
+    docs = DocList[ImageDoc]([doc, doc])
+
+    app = FastAPI()
+
+    @app.post("/doc/", response_class=DocArrayResponse)
+    async def func(fastapi_docs: DocList[ImageDoc]) -> DocList[ImageDoc]:
+        return fastapi_docs
+
+    async with AsyncClient(app=app, base_url="http://test") as ac:
+        response = await ac.post("/doc/", data=docs.to_json())
+        resp_doc = await ac.get("/docs")
+        resp_redoc = await ac.get("/redoc")
+
+    assert response.status_code == 200
+    assert resp_doc.status_code == 200
+    assert resp_redoc.status_code == 200
+
+    docs = DocList[ImageDoc].from_json(response.content.decode())
+    assert len(docs) == 2
+    assert docs[0].tensor.shape == (3, 224, 224)
diff --git a/tests/units/array/test_array.py b/tests/units/array/test_array.py
@@ -486,6 +486,8 @@ def test_validate_list_dict():
         dict(url=f'http://url.com/foo_{i}.png', tensor=NdArray(i)) for i in [2, 0, 1]
     ]
 
+    # docs = DocList[Image]([Image(url=image['url'], tensor=image['tensor']) for image in images])
+
     docs = parse_obj_as(DocList[Image], images)
 
     assert docs.url == [

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,8 @@ def test_validate_list_dict():`
`486`	`486`	`dict(url=f'http://url.com/foo_{i}.png', tensor=NdArray(i)) for i in [2, 0, 1]`
`487`	`487`	`]`
`488`	`488`
	`489`	`+ # docs = DocList[Image]([Image(url=image['url'], tensor=image['tensor']) for image in images])`
	`490`	`+`
`489`	`491`	`docs = parse_obj_as(DocList[Image], images)`
`490`	`492`
`491`	`493`	`assert docs.url == [`