interactive-pipe 0.7.6__tar.gz → 0.7.8__tar.gz

{interactive_pipe-0.7.6/src/interactive_pipe.egg-info → interactive_pipe-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.7.6
+Version: 0.7.8
 Summary: Library to create flexible interactive image processing pipelines and automatically add a graphical user interface without knowing anything about GUI coding!
 Author-email: Balthazar Neveu <balthazarneveu@gmail.com>
 Project-URL: Homepage, https://github.com/balthazarneveu/interactive_pipe
@@ -19,7 +19,7 @@ Requires-Dist: PyQt6>=6.5.2
 Requires-Dist: PyQt6_sip>=13.5.2
 Requires-Dist: opencv_python_headless>=4.8.1.78
 Requires-Dist: pytest>=6.2.5
-Requires-Dist: ipywidgets>=8.0.7
+Requires-Dist: ipywidgets>=7.7.1
 Requires-Dist: pandas
 Requires-Dist: gradio
 Provides-Extra: qt6
@@ -29,7 +29,7 @@ Provides-Extra: qt5
 Requires-Dist: PyQt5>=5.15.9; extra == "qt5"
 Requires-Dist: PyQt5_sip>=12.12.1; extra == "qt5"
 Provides-Extra: notebook
-Requires-Dist: ipywidgets>=8.0.7; extra == "notebook"
+Requires-Dist: ipywidgets>=7.7.1; extra == "notebook"
 Provides-Extra: pytest
 Requires-Dist: opencv_python_headless>=4.8.1.78; extra == "pytest"
 Requires-Dist: pytest>=6.2.5; extra == "pytest"
@@ -38,7 +38,7 @@ Requires-Dist: PyQt6>=6.5.2; extra == "full"
 Requires-Dist: PyQt6_sip>=13.5.2; extra == "full"
 Requires-Dist: opencv_python_headless>=4.8.1.78; extra == "full"
 Requires-Dist: pytest>=6.2.5; extra == "full"
-Requires-Dist: ipywidgets>=8.0.7; extra == "full"
+Requires-Dist: ipywidgets>=7.7.1; extra == "full"
 Requires-Dist: pandas; extra == "full"
 Requires-Dist: gradio; extra == "full"
 
@@ -106,7 +106,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.7.6**
+**Version 0.7.7**
 - Modular multi-image processing filters
 - Declarative: Easily make graphical user interface without having to learn anything about pyQt or matplotlib
 - Support in jupyter notebooks
@@ -115,7 +115,7 @@ pip install -e ".[full]"
 - `KeyboardControl` : no slider on UI but exactly the same internal mechanism, update on key press.
 - Support Curve plots (2D signals)
 - :new: gradio backend (+allows sharing with others). 
-- :new: Audio support in Gradio
+- :new: Audio support in Gradio (live audio or display several players by returning 1D numpy arrays)
 - :new: Circular sliders for Qt Backend
 
 

{interactive_pipe-0.7.6 → interactive_pipe-0.7.8}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "interactive_pipe"
-version = "0.7.6"
+version = "0.7.8"
 authors = [
   { name="Balthazar Neveu", email="balthazarneveu@gmail.com" },
 ]
@@ -18,7 +18,7 @@ dependencies = [
   "PyQt6_sip>=13.5.2",
   "opencv_python_headless>=4.8.1.78",
   "pytest>=6.2.5",
-  "ipywidgets>=8.0.7",
+  "ipywidgets>=7.7.1",
   "pandas",
   "gradio",
 ]
@@ -48,7 +48,7 @@ qt5=[
 ]
 
 notebook=[
-  "ipywidgets>=8.0.7",
+  "ipywidgets>=7.7.1",
 ]
 
 pytest=[
@@ -61,7 +61,7 @@ full=[
   "PyQt6_sip>=13.5.2",
   "opencv_python_headless>=4.8.1.78",
   "pytest>=6.2.5",
-  "ipywidgets>=8.0.7",
+  "ipywidgets>=7.7.1",
   "pandas",
   "gradio",
 ]

{interactive_pipe-0.7.6 → interactive_pipe-0.7.8}/readme.md

@@ -62,7 +62,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.7.6**
+**Version 0.7.7**
 - Modular multi-image processing filters
 - Declarative: Easily make graphical user interface without having to learn anything about pyQt or matplotlib
 - Support in jupyter notebooks
@@ -71,7 +71,7 @@ pip install -e ".[full]"
 - `KeyboardControl` : no slider on UI but exactly the same internal mechanism, update on key press.
 - Support Curve plots (2D signals)
 - :new: gradio backend (+allows sharing with others). 
-- :new: Audio support in Gradio
+- :new: Audio support in Gradio (live audio or display several players by returning 1D numpy arrays)
 - :new: Circular sliders for Qt Backend
 
 

interactive_pipe-0.7.8/src/interactive_pipe/data_objects/audio.py

@@ -0,0 +1,89 @@
+from pathlib import Path
+from interactive_pipe.data_objects.data import Data
+import numpy as np
+from io import BytesIO
+import base64
+import logging
+from typing import Union, Tuple
+WAVIO_AVAILABLE = False
+WAVIO = "wavio"
+try:
+    WAVIO_AVAILABLE = True
+    import wavio
+except ImportError:
+    logging.info("Cannot import wavio")
+
+
+def audio_to_html(audio: Union[None, str, Path, Tuple[int, np.ndarray]], controls=True) -> str:
+    if audio is None:
+        logging.debug("No audio to display")
+        return ""
+    if isinstance(audio, str) or isinstance(audio, Path):
+        audio_base64 = base64.b64encode(open(audio, "rb").read()).decode("utf-8")
+    elif isinstance(audio, tuple):
+        assert WAVIO_AVAILABLE, "wavio is not available"
+        assert len(audio) == 2, "audio tuple should have 2 elements: (rate, data)"
+        assert isinstance(audio[0], int), "audio[0] should be an integer"
+        assert isinstance(audio[1], np.ndarray), "audio[1] should be a numpy array"
+        audio_bytes = BytesIO()
+        wavio.write(audio_bytes, audio[1].astype(np.float32), audio[0], sampwidth=4)
+        audio_bytes.seek(0)
+        audio_base64 = base64.b64encode(audio_bytes.read()).decode("utf-8")
+    audio_player = f'<audio src="data:audio/mpeg;base64,{audio_base64}"'
+    if controls:
+        audio_player += ' controls'
+    audio_player += ' autoplay></audio>'
+
+    return audio_player
+
+
+class Audio(Data):
+    def __init__(self, data, sampling_rate: int = None, title="") -> None:
+        super().__init__(data)
+        self.title = title
+        self.path = None
+        self.sampling_rate = sampling_rate
+
+    def _set_file_extensions(self):
+        self.file_extensions = [".wav", ".mp3", ".mp4"]
+
+    def _save(self, path: Path, backend=None):
+        assert path is not None, "Save requires a path"
+        if self.title is not None:
+            self.path = self.append_with_stem(path, self.title)
+        else:
+            self.path = path
+        self.save_audio(self.data, self.path, self.sampling_rate, backend=backend)
+
+    def _load(self, path: Path, backend=None, title=None) -> Tuple[int, np.ndarray]:
+        if title is not None:
+            self.title = title
+        self.path = path
+        self.sampling_rate, audio_data = self.load_audio(path, backend=backend)
+        return self.sampling_rate, audio_data
+
+    @staticmethod
+    def save_audio(data, path: Path, sampling_rate=None, backend=None):
+        if backend is None:
+            backend = WAVIO
+        if backend == WAVIO:
+            assert WAVIO_AVAILABLE, "wavio is not available"
+            wavio.write(path, data, sampling_rate)
+        else:
+            raise NotImplementedError(f"Unknown backend: {backend}")
+
+    @staticmethod
+    def load_audio(path: Path, backend=None) -> np.ndarray:
+        if backend is None:
+            backend = WAVIO
+        if backend == WAVIO:
+            assert WAVIO_AVAILABLE, "wavio is not available"
+            audio = wavio.read(str(path))
+            return audio.rate, audio.data
+        else:
+            raise NotImplementedError(f"Unknown backend: {backend}")
+
+
+if __name__ == "__main__":
+    audio_sample_path = Path("demo")/"audio"/"rabbit.mp4"
+    rate, data = Audio.load_audio(audio_sample_path)

{interactive_pipe-0.7.6 → interactive_pipe-0.7.8}/src/interactive_pipe/graphical/gradio_gui.py

@@ -57,8 +57,12 @@ class InteractivePipeGradio(InteractivePipeGUI):
                 title = self.window.image_canvas[idx][idy].get("title", f"{idx} {idy}")
                 title = title.replace("_", " ")
                 if isinstance(out_list[idx][idy], np.ndarray):
-                    out_list_gradio_containers.append(gr.Image(label=title))
-                    self.window.image_canvas[idx][idy]["type"] = "image"
+                    if len(out_list[idx][idy].shape) == 1:
+                        out_list_gradio_containers.append(gr.Audio(label=title))
+                        self.window.image_canvas[idx][idy]["type"] = "audio"
+                    else:
+                        out_list_gradio_containers.append(gr.Image(label=title))
+                        self.window.image_canvas[idx][idy]["type"] = "image"
                 elif MPL_SUPPORT and isinstance(out_list[idx][idy], Curve):
                     # if out_list[idx][idy].title is not None:
                     #     title = out_list[idx][idy].title
@@ -81,7 +85,7 @@ class InteractivePipeGradio(InteractivePipeGUI):
 
 
 class MainWindow(InteractivePipeWindow):
-    def __init__(self, *args, controls=[], name="", pipeline: HeadlessPipeline = None, size=None, share_gradio_app=False, markdown_description=None, sliders_layout=None, sliders_per_row_layout=None, audio=False, **kwargs):
+    def __init__(self, *args, controls=[], name="", pipeline: HeadlessPipeline = None, size=None, share_gradio_app=False, markdown_description=None, sliders_layout=None, sliders_per_row_layout=None, audio=False, audio_sampling_rate: int =44100, **kwargs):
         InteractivePipeWindow.__init__(
             self, name=name, pipeline=pipeline, size=size)
         self.markdown_description = markdown_description
@@ -93,6 +97,7 @@ class MainWindow(InteractivePipeWindow):
         self.pipeline = pipeline
         self.share_gradio_app = share_gradio_app
         self.audio = audio
+        self.audio_sampling_rate = audio_sampling_rate
         # Define the functions that will be called when the input changes for gradio. => gr.Interface(fn=process_fn)
 
         def process_outputs_fn(out) -> tuple:
@@ -108,8 +113,12 @@ class MainWindow(InteractivePipeWindow):
                             Curve._plot_curve(curve.data, ax=ax)
                             flat_out.append(fig)
                         elif isinstance(out[idx][idy], np.ndarray):
-                            logging.info(f"CONVERTING IMAGE  {idx} {idy}")
-                            flat_out.append(self.convert_image(out[idx][idy]))
+                            if len(out[idx][idy].shape) == 1:
+                                logging.debug(f"CONVERTING AUDIO  {idx} {idy}")
+                                flat_out.append((self.audio_sampling_rate, out[idx][idy]))
+                            else:
+                                logging.debug(f"CONVERTING IMAGE  {idx} {idy}")
+                                flat_out.append(self.convert_image(out[idx][idy]))
                         else:
                             raise NotImplementedError(
                                 f"output type {type(out[idx][idy])} not suported")

{interactive_pipe-0.7.6 → interactive_pipe-0.7.8}/src/interactive_pipe/graphical/mpl_window.py

@@ -6,7 +6,7 @@ from interactive_pipe.data_objects.curves import Curve
 
 
 class MatplotlibWindow(InteractivePipeWindow):
-    def __init__(self,  controls=[], name="", pipeline=None, size=None, style: str = None, rc_params=None):
+    def __init__(self,  controls=[], name="", pipeline=None, size=None, style: str = None, rc_params=None, markdown_description=None):
         """
         style: dark_background, seaborn-v0_8-dark
         https://matplotlib.org/stable/gallery/style_sheets/style_sheets_reference.html
@@ -26,6 +26,7 @@ class MatplotlibWindow(InteractivePipeWindow):
         if rc_params is not None:
             for key, val in rc_params.items():
                 plt.rcParams[key] = val
+        self.markdown_description = markdown_description  # won't be used!
 
     def add_image_placeholder(self, row, col):
         nrows, ncols = np.array(self.image_canvas).shape
@@ -56,12 +57,18 @@ class MatplotlibWindow(InteractivePipeWindow):
         data = ax_dict.get("data", None)
         if data:
             if isinstance(img, np.ndarray):
-                data.set_data(img)
+                if len(img.shape) > 1:
+                    data.set_data(img)
+                elif len(img.shape) == 1:
+                    data.set_ydata(img)
             elif isinstance(img, Curve):
                 img.update_plot(data, ax=ax_dict["ax"])
         else:
             if isinstance(img, np.ndarray):
-                ax_dict["data"] = ax_dict["ax"].imshow(img)
+                if len(img.shape) > 1:
+                    ax_dict["data"] = ax_dict["ax"].imshow(img)
+                elif len(img.shape) == 1:
+                    ax_dict["data"] = Curve([img]).create_plot(ax=ax_dict["ax"])
             elif isinstance(img, Curve):
                 ax_dict["data"] = img.create_plot(ax=ax_dict["ax"])
         if not (isinstance(img, Curve) and img.data["title"] is not None):
@@ -78,7 +85,7 @@ class MatplotlibWindow(InteractivePipeWindow):
         self.need_redraw = False
 
     def convert_image(self, img):
-        if isinstance(img, np.ndarray):
+        if isinstance(img, np.ndarray) and len(img.shape) > 1:
             return img.clip(0., 1.)
         else:
             return img

{interactive_pipe-0.7.6 → interactive_pipe-0.7.8}/src/interactive_pipe/graphical/qt_gui.py

@@ -48,7 +48,7 @@ try:
     from matplotlib.backends.backend_qtagg import (
         FigureCanvas, NavigationToolbar2QT as NavigationToolbar)
     from matplotlib.figure import Figure
-    from interactive_pipe.data_objects.curves import Curve
+    from interactive_pipe.data_objects.curves import Curve, SingleCurve
     MPL_SUPPORT = True
 except ImportError:
     logging.warning("No support for Matplotlib widgets for Qt")
@@ -424,7 +424,23 @@ class MainWindow(QWidget, InteractivePipeWindow):
                 img_widget.setParent(None)
 
     def update_image(self, image_array_original, row, col):
-        if isinstance(image_array_original, np.ndarray):
+        if isinstance(image_array_original, np.ndarray) and len(image_array_original.shape) == 1:
+            logging.warning("Audio playback not supported with 1D signal" +
+                            "\nuse live audio instead while using Qt!" +
+                            "\nuse instead: context['__set_audio'](audio_track)" +
+                            "\nSee example here: https://github.com/balthazarneveu/interactive_pipe/blob/master/demo/jukebox.py")
+            logging.warning("We'll try to display the audio signal as an image instead")
+            image_array_original = Curve([
+                SingleCurve(
+                    # x=np.linspace(0, image_array_original.shape[0]/44100, image_array_original.shape[0]),
+                    y=image_array_original,
+                    # style="k"
+                )
+            ],
+                # xlabel="Time[s]",
+                ylabel="Amplitude",
+            )
+        elif isinstance(image_array_original, np.ndarray) and len(image_array_original.shape) > 1:
             if len(image_array_original.shape) == 2:
                 # Consider black & white
                 image_array = image_array_original.copy()
@@ -445,7 +461,7 @@ class MainWindow(QWidget, InteractivePipeWindow):
             pixmap = QPixmap.fromImage(image)
             image_label = self.image_canvas[row][col]["image"]
             image_label.setPixmap(pixmap)
-        else:
+        if not isinstance(image_array_original, np.ndarray):
             image_array = image_array_original
             if MPL_SUPPORT and isinstance(image_array, Curve):
                 image_label = FigureCanvas(Figure(figsize=(10, 10)))
@@ -469,7 +485,7 @@ class MainWindow(QWidget, InteractivePipeWindow):
 
     @staticmethod
     def convert_image(out_im):
-        if isinstance(out_im, np.ndarray):
+        if isinstance(out_im, np.ndarray) and len(out_im.shape) > 1:
             return (out_im.clip(0., 1.) * 255).astype(np.uint8)
         else:
             return out_im

{interactive_pipe-0.7.6 → interactive_pipe-0.7.8/src/interactive_pipe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.7.6
+Version: 0.7.8
 Summary: Library to create flexible interactive image processing pipelines and automatically add a graphical user interface without knowing anything about GUI coding!
 Author-email: Balthazar Neveu <balthazarneveu@gmail.com>
 Project-URL: Homepage, https://github.com/balthazarneveu/interactive_pipe
@@ -19,7 +19,7 @@ Requires-Dist: PyQt6>=6.5.2
 Requires-Dist: PyQt6_sip>=13.5.2
 Requires-Dist: opencv_python_headless>=4.8.1.78
 Requires-Dist: pytest>=6.2.5
-Requires-Dist: ipywidgets>=8.0.7
+Requires-Dist: ipywidgets>=7.7.1
 Requires-Dist: pandas
 Requires-Dist: gradio
 Provides-Extra: qt6
@@ -29,7 +29,7 @@ Provides-Extra: qt5
 Requires-Dist: PyQt5>=5.15.9; extra == "qt5"
 Requires-Dist: PyQt5_sip>=12.12.1; extra == "qt5"
 Provides-Extra: notebook
-Requires-Dist: ipywidgets>=8.0.7; extra == "notebook"
+Requires-Dist: ipywidgets>=7.7.1; extra == "notebook"
 Provides-Extra: pytest
 Requires-Dist: opencv_python_headless>=4.8.1.78; extra == "pytest"
 Requires-Dist: pytest>=6.2.5; extra == "pytest"
@@ -38,7 +38,7 @@ Requires-Dist: PyQt6>=6.5.2; extra == "full"
 Requires-Dist: PyQt6_sip>=13.5.2; extra == "full"
 Requires-Dist: opencv_python_headless>=4.8.1.78; extra == "full"
 Requires-Dist: pytest>=6.2.5; extra == "full"
-Requires-Dist: ipywidgets>=8.0.7; extra == "full"
+Requires-Dist: ipywidgets>=7.7.1; extra == "full"
 Requires-Dist: pandas; extra == "full"
 Requires-Dist: gradio; extra == "full"
 
@@ -106,7 +106,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.7.6**
+**Version 0.7.7**
 - Modular multi-image processing filters
 - Declarative: Easily make graphical user interface without having to learn anything about pyQt or matplotlib
 - Support in jupyter notebooks
@@ -115,7 +115,7 @@ pip install -e ".[full]"
 - `KeyboardControl` : no slider on UI but exactly the same internal mechanism, update on key press.
 - Support Curve plots (2D signals)
 - :new: gradio backend (+allows sharing with others). 
-- :new: Audio support in Gradio
+- :new: Audio support in Gradio (live audio or display several players by returning 1D numpy arrays)
 - :new: Circular sliders for Qt Backend
 
 

{interactive_pipe-0.7.6 → interactive_pipe-0.7.8}/src/interactive_pipe.egg-info/requires.txt

@@ -6,7 +6,7 @@ PyQt6>=6.5.2
 PyQt6_sip>=13.5.2
 opencv_python_headless>=4.8.1.78
 pytest>=6.2.5
-ipywidgets>=8.0.7
+ipywidgets>=7.7.1
 pandas
 gradio
 
@@ -15,12 +15,12 @@ PyQt6>=6.5.2
 PyQt6_sip>=13.5.2
 opencv_python_headless>=4.8.1.78
 pytest>=6.2.5
-ipywidgets>=8.0.7
+ipywidgets>=7.7.1
 pandas
 gradio
 
 [notebook]
-ipywidgets>=8.0.7
+ipywidgets>=7.7.1
 
 [pytest]
 opencv_python_headless>=4.8.1.78

interactive_pipe-0.7.6/src/interactive_pipe/data_objects/audio.py

@@ -1,35 +0,0 @@
-from pathlib import Path
-import numpy as np
-from io import BytesIO
-import base64
-import logging
-from typing import Union, Tuple
-WAVIO_AVAILABLE = False
-try:
-    WAVIO_AVAILABLE = True
-    import wavio
-except ImportError:
-    logging.info("Cannot import wavio")
-
-
-def audio_to_html(audio: Union[None, str, Path, Tuple[int, np.ndarray]], controls=True) -> str:
-    if audio is None:
-        logging.debug("No audio to display")
-        return ""
-    if isinstance(audio, str) or isinstance(audio, Path):
-        audio_base64 = base64.b64encode(open(audio, "rb").read()).decode("utf-8")
-    elif isinstance(audio, tuple):
-        assert WAVIO_AVAILABLE, "wavio is not available"
-        assert len(audio) == 2, "audio tuple should have 2 elements: (rate, data)"
-        assert isinstance(audio[0], int), "audio[0] should be an integer"
-        assert isinstance(audio[1], np.ndarray), "audio[1] should be a numpy array"
-        audio_bytes = BytesIO()
-        wavio.write(audio_bytes, audio[1].astype(np.float32), audio[0], sampwidth=4)
-        audio_bytes.seek(0)
-        audio_base64 = base64.b64encode(audio_bytes.read()).decode("utf-8")
-    audio_player = f'<audio src="data:audio/mpeg;base64,{audio_base64}"'
-    if controls:
-        audio_player += ' controls'
-    audio_player += ' autoplay></audio>'
-
-    return audio_player