interactive-pipe 0.7.1__tar.gz → 0.7.2__tar.gz

{interactive_pipe-0.7.1/src/interactive_pipe.egg-info → interactive_pipe-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.7.1
+Version: 0.7.2
 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
@@ -95,7 +95,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.7.1**
+**Version 0.7.2**
 - Modular multi-image processing filters
 - Declarative: Easily make graphical user interface without having to learn anything about pyQt or matplotlib
 - Support in jupyter notebooks
@@ -103,7 +103,9 @@ pip install -e ".[full]"
 - Cache intermediate results in RAM for much faster processing
 - `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: gradio backend (+allows sharing with others). 
+- :new: Audio support in Gradio
+- :new: Circular sliders for Qt Backend
 
 
 
@@ -141,8 +143,9 @@ Shortcuts while using the GUI (QT & matplotlib backends)
 | Plot curves | :heavy_check_mark: | :heavy_check_mark: |   :heavy_check_mark: | :heavy_check_mark:|
 | Auto refreshed layout | :heavy_check_mark: | :heavy_check_mark: |   :heavy_check_mark: | :heavy_minus_sign: |
 | Keyboard shortcuts / fullscreen| :heavy_check_mark: | :heavy_check_mark: |  :heavy_minus_sign: | :heavy_minus_sign: |
-| Audio support | :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign: |
+| Audio support | :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_check_mark: |
 | Image buttons| :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign:| 
+| Circular slider| :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign:| 
 
 
 

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "interactive_pipe"
-version = "0.7.1"
+version = "0.7.2"
 authors = [
   { name="Balthazar Neveu", email="balthazarneveu@gmail.com" },
 ]

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/readme.md

@@ -51,7 +51,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.7.1**
+**Version 0.7.2**
 - Modular multi-image processing filters
 - Declarative: Easily make graphical user interface without having to learn anything about pyQt or matplotlib
 - Support in jupyter notebooks
@@ -59,7 +59,9 @@ pip install -e ".[full]"
 - Cache intermediate results in RAM for much faster processing
 - `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: gradio backend (+allows sharing with others). 
+- :new: Audio support in Gradio
+- :new: Circular sliders for Qt Backend
 
 
 
@@ -97,8 +99,9 @@ Shortcuts while using the GUI (QT & matplotlib backends)
 | Plot curves | :heavy_check_mark: | :heavy_check_mark: |   :heavy_check_mark: | :heavy_check_mark:|
 | Auto refreshed layout | :heavy_check_mark: | :heavy_check_mark: |   :heavy_check_mark: | :heavy_minus_sign: |
 | Keyboard shortcuts / fullscreen| :heavy_check_mark: | :heavy_check_mark: |  :heavy_minus_sign: | :heavy_minus_sign: |
-| Audio support | :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign: |
+| Audio support | :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_check_mark: |
 | Image buttons| :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign:| 
+| Circular slider| :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign:| 
 
 
 

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/src/interactive_pipe/__init__.py

@@ -1,4 +1,5 @@
 from interactive_pipe.helper.pipeline_decorator import pipeline, interactive_pipeline
-from interactive_pipe.headless.control import Control
+from interactive_pipe.headless.control import Control, CircularControl
+from interactive_pipe.data_objects.curves import Curve, SingleCurve
 from interactive_pipe.headless.keyboard import KeyboardControl
 from interactive_pipe.helper.filter_decorator import interactive, interact

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/src/interactive_pipe/core/cache.py

@@ -48,8 +48,6 @@ class CachedResults:
         :param new_params: The new parameters to check.
         :return: True if an update is needed or False otherwise.
         """
-        if self.result is None:  # if no result force initialization
-            self.force_change = True
         change_state_from_params_check = self.state_change.has_changed(
             new_params)
         if self.force_change:

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/src/interactive_pipe/core/engine.py

@@ -58,11 +58,10 @@ class PipelineEngine:
                     if prc.inputs:
                         routing_in = [
                             result[idi] if idi is not None else None for idi in prc.inputs]
-                    logging.debug("in types->", [type(inp)
-                                  for inp in routing_in])
+                    logging.debug(f"in types-> {[type(inp) for inp in routing_in]}")
                     out = prc.run(*routing_in)
                     if out is not None:
-                        logging.debug("out types->", [type(ou) for ou in out])
+                        logging.debug(f"out types-> {[type(ou) for ou in out]}")
                 except Exception as e:
                     logging.error(f'Error in {prc.name} filter:')
                     logging.error(e)

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/src/interactive_pipe/data_objects/audio.py

@@ -12,7 +12,7 @@ except ImportError:
     logging.info("Cannot import wavio")
 
 
-def audio_to_html(audio: Union[None, str, Path, Tuple[int, np.ndarray]]) -> str:
+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 ""
@@ -27,6 +27,9 @@ def audio_to_html(audio: Union[None, str, Path, Tuple[int, np.ndarray]]) -> str:
         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}" controls autoplay></audio>'
+    audio_player = f'<audio src="data:audio/mpeg;base64,{audio_base64}"'
+    if controls:
+        audio_player += ' controls'
+    audio_player += ' autoplay></audio>'
 
     return audio_player

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/src/interactive_pipe/graphical/gradio_gui.py

@@ -150,13 +150,15 @@ class MainWindow(InteractivePipeWindow):
             # Gradio Blocks mode
             # https://www.gradio.app/guides/blocks-and-event-listeners
             with gr.Blocks() as io:
-                if self.audio:
-                    outputs.append(self.audio)
                 with gr.Row(variant="compact"):
                     gr.Markdown("### " + self.name.replace("_", " "))
                 with gr.Row():
                     for elem in outputs:
                         elem.render()
+                if self.audio:
+                    outputs.append(self.audio)
+                with gr.Row():
+                    self.audio.render()
 
                 if self.sliders_layout is None:
                     self.sliders_layout = "collapsible"

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/src/interactive_pipe/graphical/qt_control.py

@@ -8,14 +8,14 @@ PYQTVERSION = None
 
 if not PYQTVERSION:
     try:
-        from PyQt6.QtWidgets import QWidget, QLabel, QSlider, QHBoxLayout, QLineEdit, QComboBox, QCheckBox, QPushButton, QHBoxLayout
+        from PyQt6.QtWidgets import QWidget, QLabel, QSlider, QHBoxLayout, QLineEdit, QComboBox, QCheckBox, QPushButton, QHBoxLayout, QDial
         from PyQt6.QtCore import Qt, QSize
         from PyQt6.QtGui import QIcon
         PYQTVERSION = 6
     except ImportError:
         logging.warning("Cannot import PyQt")
         try:
-            from PyQt5.QtWidgets import QWidget, QLabel, QSlider, QHBoxLayout, QLineEdit, QComboBox, QCheckBox, QPushButton, QHBoxLayout
+            from PyQt5.QtWidgets import QWidget, QLabel, QSlider, QHBoxLayout, QLineEdit, QComboBox, QCheckBox, QPushButton, QHBoxLayout, QDial
             from PyQt5.QtCore import Qt, QSize
             from PyQt5.QtGui import QIcon
             PYQTVERSION = 5
@@ -23,7 +23,7 @@ if not PYQTVERSION:
             raise ModuleNotFoundError("No PyQt")
 if not PYQTVERSION:
     try:
-        from PySide6.QtWidgets import QWidget, QLabel, QSlider, QHBoxLayout, QLineEdit, QComboBox, QCheckBox, QPushButton, QHBoxLayout
+        from PySide6.QtWidgets import QWidget, QLabel, QSlider, QHBoxLayout, QLineEdit, QComboBox, QCheckBox, QPushButton, QHBoxLayout, QDial
         from PySide6.QtCore import Qt, QSize
         from PySide6.QtGui import QIcon
         PYQTVERSION = 6
@@ -86,8 +86,17 @@ class IntSliderControl(BaseControl):
         assert self.ctrl._type == int
 
     def create(self):
-        slider_class = SilentSlider if self.silent else QSlider
-        slider = slider_class(Qt.Orientation.Horizontal, self)
+        if self.silent:
+            slider_class = SilentSlider
+            slider = slider_class(Qt.Orientation.Horizontal, self)
+        else:
+            if hasattr(self.ctrl, 'modulo') and self.ctrl.modulo:
+                slider_class = QDial
+                slider = slider_class(self)
+            else:
+                slider_class = QSlider
+                slider = slider_class(Qt.Orientation.Horizontal, self)
+                
         slider.setRange(self.ctrl.value_range[0],  self.ctrl.value_range[1])
         slider.setValue(self.ctrl.value_default)
         slider.setSingleStep(1)
@@ -112,12 +121,16 @@ class FloatSliderControl(BaseControl):
         return self.ctrl.value_range[0] + (self.ctrl.value_range[1]-self.ctrl.value_range[0])*val/1000
 
     def create(self):
-        # Create a horizontal layout to hold the slider and line edit
-        # hbox = QHBoxLayout()
-        slider_class = SilentSlider if self.silent else QSlider
-
-        # Create the slider with integer range and step size
-        slider = slider_class(Qt.Orientation.Horizontal, self)
+        if self.silent:
+            slider_class = SilentSlider
+            slider = slider_class(Qt.Orientation.Horizontal, self)
+        else:
+            if hasattr(self.ctrl, 'modulo') and self.ctrl.modulo:
+                slider_class = QDial
+                slider = slider_class(self)
+            else:
+                slider_class = QSlider
+                slider = slider_class(Qt.Orientation.Horizontal, self)
         self.ctrl.convert_int_to_value = self.convert_int_to_value
         slider.setRange(self.convert_value_to_int(
             self.ctrl.value_range[0]), self.convert_value_to_int(self.ctrl.value_range[1]))

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2}/src/interactive_pipe/headless/control.py

@@ -143,3 +143,17 @@ class Control():
         self.update_param_func = update_param_func
         self.parameter_name_to_connect = parameter_name
         self.filter_to_connect = filter
+
+
+class CircularControl(Control):
+    """
+    Replace a slider by a circular slider
+    """
+
+    def __init__(self, value_default: Union[int, float, bool, str], value_range: List[Union[int, float, str]] = None, modulo=True, name=None, step=None, filter_to_connect: Optional[FilterCore] = None, parameter_name_to_connect: Optional[str] = None) -> None:
+        super().__init__(value_default=value_default, value_range=value_range, name=name, step=step,
+                         filter_to_connect=filter_to_connect, parameter_name_to_connect=parameter_name_to_connect, icons=None)
+        self.modulo = modulo
+
+    def __repr__(self) -> str:
+        return super().__repr__() + f"| modulo:{self.modulo}"

{interactive_pipe-0.7.1 → interactive_pipe-0.7.2/src/interactive_pipe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.7.1
+Version: 0.7.2
 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
@@ -95,7 +95,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.7.1**
+**Version 0.7.2**
 - Modular multi-image processing filters
 - Declarative: Easily make graphical user interface without having to learn anything about pyQt or matplotlib
 - Support in jupyter notebooks
@@ -103,7 +103,9 @@ pip install -e ".[full]"
 - Cache intermediate results in RAM for much faster processing
 - `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: gradio backend (+allows sharing with others). 
+- :new: Audio support in Gradio
+- :new: Circular sliders for Qt Backend
 
 
 
@@ -141,8 +143,9 @@ Shortcuts while using the GUI (QT & matplotlib backends)
 | Plot curves | :heavy_check_mark: | :heavy_check_mark: |   :heavy_check_mark: | :heavy_check_mark:|
 | Auto refreshed layout | :heavy_check_mark: | :heavy_check_mark: |   :heavy_check_mark: | :heavy_minus_sign: |
 | Keyboard shortcuts / fullscreen| :heavy_check_mark: | :heavy_check_mark: |  :heavy_minus_sign: | :heavy_minus_sign: |
-| Audio support | :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign: |
+| Audio support | :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_check_mark: |
 | Image buttons| :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign:| 
+| Circular slider| :heavy_check_mark: | :heavy_minus_sign: |  :heavy_minus_sign: | :heavy_minus_sign:|