interactive-pipe 0.8.0__tar.gz → 0.8.2__tar.gz

{interactive_pipe-0.8.0/src/interactive_pipe.egg-info → interactive_pipe-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.8.0
+Version: 0.8.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
@@ -106,7 +106,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.8.0**
+**Version 0.8.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

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/pyproject.toml

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

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/readme.md

@@ -62,7 +62,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.8.0**
+**Version 0.8.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

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/src/interactive_pipe/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.8.0"
+__version__ = "0.8.2"
 from interactive_pipe.helper.pipeline_decorator import pipeline, interactive_pipeline
 from interactive_pipe.headless.control import Control, CircularControl
 from interactive_pipe.data_objects.curves import Curve, SingleCurve

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/src/interactive_pipe/core/engine.py

@@ -40,7 +40,7 @@ class PipelineEngine:
             # if cache not available or if cache available and values have changed, need to recalculate from now on
             # cache | has changed | skip_calculation
             # 0     | X           | False -> no cache, cannot skip so calculate
-            # 1     | 0           | True -> cache with no change, skip the calculation
+            # 1     | 0           | True  -> cache with no change, skip the calculation
             # 1     | 1           | False -> cache and result changed, cannot skip so calculate
             skip_calculation &= (prc.cache_mem is not None) and (
                 not prc.cache_mem.has_changed(prc.values))

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/src/interactive_pipe/core/pipeline.py

@@ -78,6 +78,10 @@ class PipelineCore:
         """
         return self.engine.run(self.filters, imglst=self.inputs)
 
+    def _reset_global_params(self):
+        for filter in self.filters:
+            filter.global_params = self.global_params
+
     @property
     def parameters(self):
         parameters = {}

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/src/interactive_pipe/data_objects/audio.py

@@ -13,6 +13,8 @@ try:
 except ImportError:
     logging.info("Cannot import wavio")
 
+__iter_audio_player = 0
+
 
 def audio_to_html(audio: Union[None, str, Path, Tuple[int, np.ndarray]], controls=True) -> str:
     if audio is None:
@@ -33,6 +35,10 @@ def audio_to_html(audio: Union[None, str, Path, Tuple[int, np.ndarray]], control
     if controls:
         audio_player += ' controls'
     audio_player += ' autoplay></audio>'
+    global __iter_audio_player
+    # to avoid reusing the same exact id and thus not updating the audio player
+    audio_player += "<p hidden>"+str(__iter_audio_player)+"</p>"
+    __iter_audio_player += 1
 
     return audio_player
 

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/src/interactive_pipe/graphical/gradio_control.py

@@ -1,5 +1,3 @@
-
-from functools import partial
 from interactive_pipe.headless.control import Control
 import logging
 import gradio as gr
@@ -31,7 +29,7 @@ class ControlFactory:
             bool: TickBoxControl,
             int: IntSliderControl,
             float: FloatSliderControl,
-            str: DropdownMenuControl
+            str: DropdownMenuControl if control.icons is None else IconButtonsControl
         }
 
         if control_type not in control_class_map:
@@ -101,3 +99,20 @@ class DropdownMenuControl(BaseControl):
         if index >= 0:
             self.control_widget.setCurrentIndex(index)
         self.control_widget.setCurrentIndex(index)
+
+
+class IconButtonsControl(BaseControl):
+    def check_control_type(self):
+        assert self.ctrl._type == str
+        if not hasattr(self.ctrl, 'value_range'):
+            raise ValueError("Invalid control type")
+
+    def create(self) -> gr.Radio:
+        self.control_widget = []
+        for idx, icon in enumerate(self.ctrl.icons):
+            # text = self.ctrl.value_range[idx]
+            text = ""
+            self.control_widget.append(
+                gr.Button(text, icon=self.ctrl.icons[idx])
+            )
+        return self.control_widget

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/src/interactive_pipe/graphical/gradio_gui.py

@@ -8,6 +8,7 @@ from interactive_pipe.graphical.window import InteractivePipeWindow
 from interactive_pipe.graphical.gui import InteractivePipeGUI
 from interactive_pipe.headless.control import Control
 from interactive_pipe.data_objects.audio import audio_to_html
+from copy import copy
 import logging
 PYQTVERSION = None
 MPL_SUPPORT = False
@@ -46,7 +47,18 @@ class InteractivePipeGradio(InteractivePipeGUI):
 
     def run(self) -> list:
         assert self.pipeline._PipelineCore__initialized_inputs, "Did you forget to initialize the pipeline inputs?"
+        # In gradio, the first run is a "dry run", used to get the output types...
+        try:
+            global_params_first_run = copy(self.pipeline.global_params)
+            # Do not use deepcopy, it will break the audio playback feature
+        except Exception as exc:
+            logging.warning(f"Cannot copy global_params: {exc}")
+            global_params_first_run = self.pipeline.global_params
+            pass
         out_list = self.window.process_inputs_fn(*self.window.default_values)
+        self.pipeline.global_params = global_params_first_run
+        # Reset global parameters... in case they were modified by the first run
+        self.pipeline._reset_global_params()
         self.window.refresh_display(out_list)
         out_list_gradio_containers = []
         for idx in range(len(out_list)):
@@ -147,7 +159,10 @@ class MainWindow(InteractivePipeWindow):
             out_tuple = process_outputs_fn(out)
             if self.audio:
                 html_audio = audio_to_html(self.audio_content)
-                return *out_tuple, html_audio
+                if isinstance(out_tuple, tuple):
+                    return *out_tuple, html_audio
+                else:
+                    return out_tuple, html_audio
             return out_tuple
         self.default_values = [self.ctrl[ctrl_key].value for ctrl_key in self.ctrl.keys()]
         self.process_inputs_fn = process_inputs_fn
@@ -221,9 +236,14 @@ class MainWindow(InteractivePipeWindow):
                         continue
                     if self.sliders_per_row_layout == 1:
                         with selected_mode:
-                            for idx in ctrl_indices:
-                                elem = self.widget_list[idx]
-                                elem.render()
+                            for idx in range(len(self.widget_list)):
+                                if isinstance(self.widget_list[idx], list):
+                                    with gr.Row():
+                                        for elem in self.widget_list[idx]:
+                                            elem.render()
+                                else:
+                                    elem = self.widget_list[idx]
+                                    elem.render()
                     else:
                         with selected_mode:
                             for split_num in range(math.ceil(len(ctrl_indices)/self.sliders_per_row_layout)):
@@ -233,10 +253,19 @@ class MainWindow(InteractivePipeWindow):
                                     for idx in ctrl_indices[start:end]:
                                         elem = self.widget_list[idx]
                                         elem.render()
-
-                with gr.Accordion("Reset to default values", open=False):
-                    gr.Examples([self.default_values], inputs=self.widget_list, label="Presets")
-
+                changing_inputs = []
+                discard_reset_button = False
+                for idx in range(len(self.widget_list)):
+                    if isinstance(self.widget_list[idx], list):
+                        changing_inputs.append(gr.State(self.ctrl[list(self.ctrl.keys())[idx]].value_default))
+                        discard_reset_button = True  # Do not show reset button if there are lists of buttons
+                        self.ctrl[list(self.ctrl.keys())[idx]].filter_to_connect.cache = False
+                        self.ctrl[list(self.ctrl.keys())[idx]].filter_to_connect.cache_mem = None
+                    else:
+                        changing_inputs.append(self.widget_list[idx])
+                if not discard_reset_button:
+                    with gr.Accordion("Reset to default values", open=False):
+                        gr.Examples([self.default_values], inputs=changing_inputs, label="Presets")
                 if self.markdown_description is not None:
                     title = "Description"
                     try:
@@ -246,13 +275,27 @@ class MainWindow(InteractivePipeWindow):
                         pass
                     with gr.Accordion(title, open=False):
                         gr.Markdown(self.markdown_description)
-                io.load(fn=self.run_fn, inputs=self.widget_list, outputs=outputs)
+                io.load(fn=self.run_fn, inputs=changing_inputs, outputs=outputs)
                 for idx in range(len(self.widget_list)):
-                    self.widget_list[idx].change(
-                        fn=self.run_fn, inputs=self.widget_list,
-                        outputs=outputs,
-                        show_progress="minimal"
-                    )
+                    if isinstance(self.widget_list[idx], list):
+                        for idy, elem in enumerate(self.widget_list[idx]):
+                            changing_inputs_copy = changing_inputs.copy()
+                            changing_inputs_copy[idx] = gr.State(
+                                self.ctrl[list(self.ctrl.keys())[idx]].value_range[idy])
+                            elem.click(
+                                fn=self.run_fn,
+                                inputs=changing_inputs_copy,
+                                outputs=outputs,
+                                show_progress="minimal"
+                            )
+                    else:
+                        self.widget_list[idx].change(
+                            fn=self.run_fn,
+                            inputs=changing_inputs,
+                            outputs=outputs,
+                            show_progress="minimal"
+                        )
+
             self.io = io
         self.io.launch(share=self.share_gradio_app)
 

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2}/src/interactive_pipe/graphical/qt_gui.py

@@ -318,6 +318,11 @@ class MainWindow(QWidget, InteractivePipeWindow):
             elif isinstance(ctrl, Control):
                 slider_instance = control_factory.create_control(
                     ctrl, self.update_parameter)
+                if ctrl._type == str and ctrl.icons is not None:
+                    ctrl.filter_to_connect.cache = False
+                    ctrl.filter_to_connect.cache_mem = None
+                    # Disable cache for dropdown menu with icons!
+                    # Allows clicking on the same item multiple times
                 slider_or_layout = slider_instance.create()
                 self.widget_list[slider_name] = slider_instance
 

{interactive_pipe-0.8.0 → interactive_pipe-0.8.2/src/interactive_pipe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.8.0
+Version: 0.8.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
@@ -106,7 +106,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.8.0**
+**Version 0.8.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