wip: remove non notebook

Signed-off-by: anna-charlotte <[email protected]>
docarray · samsja · Feb 17, 2023 · Feb 9, 2023 · Feb 9, 2023 · Feb 9, 2023
commit 62b58ee0e57307510a13128d066249480197d42e
diff --git a/docarray/typing/tensor/audio/abstract_audio_tensor.py b/docarray/typing/tensor/audio/abstract_audio_tensor.py
@@ -3,7 +3,6 @@
 from typing import BinaryIO, TypeVar, Union
 
 from docarray.typing.tensor.abstract_tensor import AbstractTensor
-from docarray.utils.misc import is_notebook
 
 T = TypeVar('T', bound='AbstractAudioTensor')
 
@@ -43,33 +42,10 @@ def save_to_wav_file(
             f.writeframes(self.to_bytes())
 
     def display(self, rate=44100):
+        """
+        Play audio data from tensor in notebook.
+        """
         audio_np = self.get_comp_backend().to_numpy(self)
-        if is_notebook():
-            from IPython.display import Audio, display
-
-            display(Audio(audio_np, rate=rate))
-        else:
-            # b = self.load()
-            # res = requests.get(self)
-            # print(f"type(res.text) = {type(res.text)}")
-            # print(f"type(res.content) = {type(res.content)}")
-            # sound = AudioSegment.from_file(BytesIO(res.content), "wav")
-            # sound = AudioSegment.from_file(self, format="wav")
-            import os
-            import tempfile
-
-            # sound = AudioSegment.from_file(self, format="wav")
-            # raise NotImplementedError
-            # from io import BytesIO
-            # import requests
-            from pydub import AudioSegment
-            from pydub.playback import play
+        from IPython.display import Audio, display
 
-            tmp = tempfile.NamedTemporaryFile(delete=False)
-            try:
-                self.save_to_wav_file(tmp)
-                sound = AudioSegment.from_file(tmp, "wav")
-                play(sound)
-            finally:
-                tmp.close()
-                os.unlink(tmp.name)
+        display(Audio(audio_np, rate=rate))
diff --git a/docarray/typing/tensor/image/abstract_image_tensor.py b/docarray/typing/tensor/image/abstract_image_tensor.py
@@ -2,7 +2,6 @@
 from abc import ABC
 
 from docarray.typing.tensor.abstract_tensor import AbstractTensor
-from docarray.utils.misc import is_notebook
 
 
 class AbstractImageTensor(AbstractTensor, ABC):
@@ -31,16 +30,13 @@ def to_bytes(self, format: str = 'PNG') -> bytes:
 
     def display(self) -> None:
         """
-        Display image data from tensor.
+        Display image data from tensor in notebook.
         """
         from PIL import Image
 
         np_array = self.get_comp_backend().to_numpy(self)
         img = Image.fromarray(np_array)
 
-        if is_notebook():
-            from IPython.display import display
+        from IPython.display import display
 
-            display(img)
-        else:
-            img.show()
+        display(img)
diff --git a/docarray/typing/tensor/video/video_tensor_mixin.py b/docarray/typing/tensor/video/video_tensor_mixin.py
@@ -112,6 +112,6 @@ class MyDoc(BaseDocument):
 
     def display(self) -> None:
         """
-        Display video data from tensor.
+        Display video data from tensor in notebook.
         """
         raise NotImplementedError
diff --git a/docarray/typing/url/audio_url.py b/docarray/typing/url/audio_url.py
@@ -5,7 +5,6 @@
 from docarray.typing.bytes.audio_bytes import AudioBytes
 from docarray.typing.proto_register import _register_proto
 from docarray.typing.url.any_url import AnyUrl
-from docarray.utils.misc import is_notebook
 
 if TYPE_CHECKING:
     from pydantic import BaseConfig
@@ -71,29 +70,14 @@ class MyDoc(Document):
 
     def display(self):
         """
-        Play the audio sound from url.
+        Play the audio sound from url in notebook.
         """
         remote_url = True if self.startswith('http') else False
 
-        if is_notebook():
-            from IPython.display import Audio, display
+        from IPython.display import Audio, display
 
-            if remote_url:
-                display(Audio(data=self))
+        if remote_url:
+            display(Audio(data=self))
 
-            else:
-                display(Audio(filename=self))
         else:
-            from pydub import AudioSegment
-            from pydub.playback import play
-
-            if remote_url:
-                from io import BytesIO
-
-                import requests
-
-                res = requests.get(self)
-                sound = AudioSegment.from_file(BytesIO(res.content), "wav")
-            else:
-                sound = AudioSegment.from_file(self, format="wav")
-            play(sound)
+            display(Audio(filename=self))
diff --git a/docarray/typing/url/image_url.py b/docarray/typing/url/image_url.py
@@ -4,7 +4,6 @@
 
 from docarray.typing.proto_register import _register_proto
 from docarray.typing.url.any_url import AnyUrl
-from docarray.utils.misc import is_notebook
 
 if TYPE_CHECKING:
     from pydantic import BaseConfig
@@ -92,18 +91,13 @@ class MyDoc(BaseDocument):
 
     def display(self) -> None:
         """
-        Display image data from url.
+        Display image data from url in notebook.
         """
         remote_url = True if self.startswith('http') else False
 
-        if is_notebook():
-            from IPython.display import Image, display
+        from IPython.display import Image, display
 
-            if remote_url:
-                display(Image(url=self))
-            else:
-                display(Image(filename=self))
+        if remote_url:
+            display(Image(url=self))
         else:
-            from PIL import Image
-
-            Image.fromarray(self.load()).show()
+            display(Image(filename=self))
diff --git a/docarray/typing/url/video_url.py b/docarray/typing/url/video_url.py
@@ -8,7 +8,6 @@
 from docarray.typing.tensor.ndarray import NdArray
 from docarray.typing.tensor.video import VideoNdArray
 from docarray.typing.url.any_url import AnyUrl
-from docarray.utils.misc import is_notebook
 
 if TYPE_CHECKING:
     from pydantic import BaseConfig
@@ -134,37 +133,13 @@ class MyDoc(BaseDocument):
 
     def display(self):
         """
-        Play video from url.
+        Play video from url in notebook.
         """
         remote_url = True if self.startswith('http') else False
 
-        if is_notebook():
-            from IPython.display import Video, display
+        from IPython.display import Video, display
 
-            if remote_url:
-                display(Video(data=self))
-            else:
-                display(Video(filename=self))
+        if remote_url:
+            display(Video(data=self))
         else:
-            import pyglet
-
-            player = pyglet.media.Player()
-            pyglet.media.StreamingSource()
-            media = pyglet.media.load(self, streaming=True)
-            player.queue(media)
-
-            width = player.source.video_format.width
-            height = player.source.video_format.height
-            title = self.split('/')[-1]
-            window = pyglet.window.Window(width, height, title)
-
-            player.play()
-
-            @window.event
-            def on_draw():
-                window.clear()
-
-                if player.source and player.source.video_format:
-                    player.get_texture().blit(0, 0)
-
-            pyglet.app.run()
+            display(Video(filename=self))