test: adjust tests

Signed-off-by: anna-charlotte <[email protected]>
docarray · samsja · Jan 17, 2023 · Jan 3, 2023 · Jan 3, 2023 · Jan 4, 2023
commit 406ec8084b054abb4932fdeb6258a73e4a02056e
diff --git a/tests/integrations/predefined_document/test_video.py b/tests/integrations/predefined_document/test_video.py
@@ -4,7 +4,7 @@
 import pytest
 
 from docarray import Video
-from docarray.typing import VideoNdArray
+from docarray.typing import AudioNdArray, NdArray, VideoNdArray
 from tests import TOYDATA_DIR
 
 LOCAL_VIDEO_FILE = str(TOYDATA_DIR / 'mov_bbb.mp4')
@@ -15,62 +15,62 @@
 @pytest.mark.internet
 @pytest.mark.parametrize('file_url', [LOCAL_VIDEO_FILE, REMOTE_VIDEO_FILE])
 def test_video(file_url):
-    video = Video(url=file_url)
-    video.tensor, video.key_frame_indices = video.url.load()
+    vid = Video(url=file_url)
+    vid.audio_tensor, vid.video_tensor, vid.key_frame_indices = vid.url.load()
 
-    assert isinstance(video.tensor, np.ndarray)
-    assert isinstance(video.tensor, VideoNdArray)
-    assert isinstance(video.key_frame_indices, np.ndarray)
+    assert isinstance(vid.audio_tensor, AudioNdArray)
+    assert isinstance(vid.video_tensor, VideoNdArray)
+    assert isinstance(vid.key_frame_indices, NdArray)
 
 
 @pytest.mark.slow
 @pytest.mark.internet
-@pytest.mark.parametrize('file_url', [LOCAL_VIDEO_FILE])  # , REMOTE_VIDEO_FILE])
+@pytest.mark.parametrize('file_url', [LOCAL_VIDEO_FILE, REMOTE_VIDEO_FILE])
 def test_save_video_ndarray(file_url, tmpdir):
     tmp_file = str(TOYDATA_DIR / 'tmp.mp4')
 
     video_1 = Video(url=file_url)
     assert video_1.url == file_url
 
-    video_1.tensor, _ = video_1.url.load()
-    assert isinstance(video_1.tensor, np.ndarray)
-    assert isinstance(video_1.tensor, VideoNdArray)
+    audio_tensor, video_1.video_tensor, _ = video_1.url.load()
+    assert isinstance(video_1.video_tensor, np.ndarray)
+    assert isinstance(video_1.video_tensor, VideoNdArray)
 
     # from PIL import Image
     # Image.fromarray(video_1.tensor[0]).show()
 
-    video_1.tensor.save_to_file(tmp_file)
+    video_1.video_tensor.save_to_mp4_file(file_path=tmp_file, audio_tensor=audio_tensor)
     assert os.path.isfile(tmp_file)
-    print(f"video_1.tensor[0][:2] = {video_1.tensor[0][:2]}")
-
-    video_2 = Video(url=tmp_file)
-    video_2.tensor, _ = video_2.url.load()
-    video_2.tensor.save_to_file(str(TOYDATA_DIR / 'tmp_2.mp4'))
-
-    # video_3 = Video(url=str(tmpdir / f'tmp_2.mp4'))
+    print(f"\nvideo_1.tensor[0][:2] = {video_1.video_tensor[0][:2]}")
+    #
+    # video_2 = Video(url=tmp_file)
+    # video_2.tensor, _ = video_2.url.load()
+    # video_2.tensor.save_to_file(str(tmpdir / 'tmp_2.mp4'))
+    #
+    # video_3 = Video(url=str(tmpdir / f'tmp.mp4'))
     # video_3.tensor, _ = video_3.url.load()
     # video_3.tensor.save_to_file(str(tmpdir / f'tmp_3.mp4'))
     #
-    # video_4 = Video(url=str(tmpdir / f'tmp_3.mp4'))
+    # video_4 = Video(url=str(tmpdir / f'tmp.mp4'))
     # video_4.tensor, _ = video_4.url.load()
     # video_4.tensor.save_to_file(str(tmpdir / f'tmp_4.mp4'))
     #
-    # video_5 = Video(url=str(tmpdir / f'tmp_4.mp4'))
+    # video_5 = Video(url=str(tmpdir / f'tmp.mp4'))
     # video_5.tensor, _ = video_5.url.load()
     # video_5.tensor.save_to_file(str(tmpdir / f'tmp_5.mp4'))
     #
-    # video_6 = Video(url=str(tmpdir / f'tmp_5.mp4'))
+    # video_6 = Video(url=str(tmpdir / f'tmp.mp4'))
     # video_6.tensor, _ = video_6.url.load()
     # video_6.tensor.save_to_file(str(tmpdir / f'tmp_6.mp4'))
     #
-    print(f"video_2.tensor[0][:2] = {video_2.tensor[0][:2]}")
+    # print(f"video_2.tensor[0][:2] = {video_2.tensor[0][:2]}")
     # print(f"video_3.tensor[0][:2] = {video_3.tensor[0][:2]}")
     # print(f"video_4.tensor[0][:2] = {video_3.tensor[0][:2]}")
     # print(f"video_5.tensor[0][:2] = {video_3.tensor[0][:2]}")
     # print(f"video_6.tensor[0][:2] = {video_3.tensor[0][:2]}")
-
-    # Image.fromarray(video_1.tensor[0]).show()
-    assert isinstance(video_1.tensor, np.ndarray)
-    assert isinstance(video_1.tensor, VideoNdArray)
-    assert video_1.tensor.shape == video_2.tensor.shape
-    assert np.allclose(video_1.tensor, video_2.tensor, atol=100)
+    #
+    # # Image.fromarray(video_1.tensor[0]).show()
+    # assert isinstance(video_1.tensor, np.ndarray)
+    # assert isinstance(video_1.tensor, VideoNdArray)
+    # # assert video_1.tensor.shape == video_2.tensor.shape
+    # # assert np.allclose(video_1.tensor, video_2.tensor)
diff --git a/tests/units/typing/tensor/test_video_tensor.py b/tests/units/typing/tensor/test_video_tensor.py
@@ -83,5 +83,5 @@ def test_proto_tensor(cls_tensor, tensor, proto_key):
 def test_save_video_tensor_to_file(cls_tensor, tensor, tmpdir):
     tmp_file = str(tmpdir / 'tmp.mp4')
     video_tensor = parse_obj_as(cls_tensor, tensor)
-    video_tensor.save_to_file(tmp_file)
+    video_tensor.save_to_mp4_file(tmp_file)
     assert os.path.isfile(tmp_file)
diff --git a/tests/units/typing/url/test_video_url.py b/tests/units/typing/url/test_video_url.py
@@ -6,7 +6,7 @@
 
 from docarray import BaseDocument
 from docarray.document.io.json import orjson_dumps
-from docarray.typing import VideoNdArray, VideoTorchTensor, VideoUrl
+from docarray.typing import NdArray, VideoNdArray, VideoTorchTensor, VideoUrl
 from tests import TOYDATA_DIR
 
 LOCAL_VIDEO_FILE = str(TOYDATA_DIR / 'mov_bbb.mp4')
@@ -27,7 +27,7 @@ def test_load_with_only_keyframes_false(file_url):
     assert isinstance(tensor, VideoNdArray)
 
     assert isinstance(indices, np.ndarray)
-    assert isinstance(indices, VideoNdArray)
+    assert isinstance(indices, NdArray)
 
 
 @pytest.mark.slow