interactive-pipe 0.8.4__tar.gz → 0.8.5__tar.gz

{interactive_pipe-0.8.4/src/interactive_pipe.egg-info → interactive_pipe-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.8.4
+Version: 0.8.5
 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.4**
+**Version 0.8.5**
 - 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.4 → interactive_pipe-0.8.5}/pyproject.toml

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

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5}/readme.md

@@ -62,7 +62,7 @@ pip install -e ".[full]"
 
 ## :scroll:  Features
 
-**Version 0.8.4**
+**Version 0.8.5**
 - 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.4 → interactive_pipe-0.8.5}/src/interactive_pipe/__init__.py

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

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5}/src/interactive_pipe/graphical/gradio_gui.py

@@ -82,6 +82,8 @@ class InteractivePipeGradio(InteractivePipeGUI):
                     out_list_gradio_containers.append(gr.Plot(label=title))
                     self.window.image_canvas[idx][idy]["type"] = "curve"
                 # @TODO: https://github.com/balthazarneveu/interactive_pipe/issues/50 support audio!
+                elif isinstance(out_list[idx][idy], str):
+                    out_list_gradio_containers.append(gr.Textbox(label=title))
                 else:
                     raise NotImplementedError(
                         f"output type {type(out_list[idx][idy])} not supported")
@@ -135,6 +137,8 @@ class MainWindow(InteractivePipeWindow):
                             else:
                                 logging.debug(f"CONVERTING IMAGE  {idx} {idy}")
                                 flat_out.append(self.convert_image(out[idx][idy]))
+                        elif isinstance(out[idx][idy], str):
+                            flat_out.append(out[idx][idy])
                         else:
                             raise NotImplementedError(
                                 f"output type {type(out[idx][idy])} not suported")

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5}/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, markdown_description=None):
+    def __init__(self,  controls=[], name="", pipeline=None, size=None, style: str = None, rc_params=None, **unused_kwargs):
         """
         style: dark_background, seaborn-v0_8-dark
         https://matplotlib.org/stable/gallery/style_sheets/style_sheets_reference.html
@@ -26,7 +26,6 @@ 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
@@ -63,6 +62,8 @@ class MatplotlibWindow(InteractivePipeWindow):
                     data.set_ydata(img)
             elif isinstance(img, Curve):
                 img.update_plot(data, ax=ax_dict["ax"])
+            elif isinstance(img, str):
+                data.set_text(img)
         else:
             if isinstance(img, np.ndarray):
                 if len(img.shape) > 1:
@@ -71,6 +72,8 @@ class MatplotlibWindow(InteractivePipeWindow):
                     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"])
+            elif isinstance(img, str):
+                ax_dict["data"] = ax_dict["ax"].text(0.5, 0.5, img, ha='center', va='center', fontsize=10)
         if not (isinstance(img, Curve) and img.data["title"] is not None):
             self.update_style(ax_dict["ax"], style=current_style)
 

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5}/src/interactive_pipe/graphical/nb_control.py

@@ -1,4 +1,4 @@
-from ipywidgets import Dropdown, FloatSlider, IntSlider, Checkbox, Layout
+from ipywidgets import Dropdown, FloatSlider, IntSlider, Checkbox, Layout, Text
 from interactive_pipe.headless.control import Control
 import logging
 
@@ -55,9 +55,23 @@ class DialogNotebookControl(BaseControl):
 
     def create(self):
         options = self.ctrl.value_range
-        radio = Dropdown(
+        dropdown = Dropdown(
             options=options, description=self.name, layout=self.layout)
-        return radio
+        return dropdown
+
+
+class PromptNotebookControl(BaseControl):
+    def check_control_type(self):
+        assert self.ctrl._type == str
+        assert self.ctrl.value_range is None
+
+    def create(self):
+        text_box = Text(
+            value=self.ctrl.value,
+            description=self.name,
+            layout=self.layout
+        )
+        return text_box
 
 
 class ControlFactory:
@@ -69,7 +83,7 @@ class ControlFactory:
             bool: BoolCheckButtonNotebookControl,
             int: IntSliderNotebookControl,
             float: FloatSliderNotebookControl,
-            str: DialogNotebookControl,
+            str: PromptNotebookControl if control.value_range is None else DialogNotebookControl,
         }
 
         if control_type not in control_class_map:

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5}/src/interactive_pipe/graphical/nb_gui.py

@@ -24,7 +24,7 @@ class InteractivePipeJupyter(InteractivePipeGUI):
 
 
 class MainWindow(MatplotlibWindow):
-    def __init__(self,  controls=[], name="", pipeline=None, size: Optional[Union[int, Tuple[int, int]]] = None, style: str = None, rc_params=None):
+    def __init__(self,  controls=[], name="", pipeline=None, size: Optional[Union[int, Tuple[int, int]]] = None, style: str = None, rc_params=None, **unused_kwargs):
         if size is not None and isinstance(size, int):
             size = (size, size)
         assert size is None or isinstance(size, tuple) or isinstance(

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5}/src/interactive_pipe/graphical/qt_gui.py

@@ -469,6 +469,9 @@ class MainWindow(QWidget, InteractivePipeWindow):
             pixmap = QPixmap.fromImage(image)
             image_label = self.image_canvas[row][col]["image"]
             image_label.setPixmap(pixmap)
+        elif isinstance(image_array_original, str):
+            txt_label = self.image_canvas[row][col]["image"]
+            txt_label.setText(image_array_original)
         if not isinstance(image_array_original, np.ndarray):
             image_array = image_array_original
             if MPL_SUPPORT and isinstance(image_array, Curve):
@@ -487,7 +490,9 @@ class MainWindow(QWidget, InteractivePipeWindow):
                 else:
                     image_array.update_plot(plt_obj, ax=ax)
                     ax.figure.canvas.draw()
-
+            elif isinstance(image_array, str):
+                txt_label = self.image_canvas[row][col]["image"]
+                txt_label.setText(image_array)
         text_label = self.image_canvas[row][col]["title"]
         text_label.setText(self.get_current_style(row, col).get("title", ""))
 

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5}/src/interactive_pipe/helper/pipeline_decorator.py

@@ -20,7 +20,9 @@ def interactive_pipeline(
     global_state: Optional[dict] = None,  # alias for global_params
     global_context: Optional[dict] = None,  # alias for global_params
     context: Optional[dict] = None,  # alias for global_params
-    state: Optional[dict] = None,  # alias for global_params
+    state: Optional[dict] = None,  # alias for global_params,
+    markdown_description: Optional[str] = None,
+    name: Optional[str] = None,
     **kwargs_gui,
 ) -> Union[HeadlessPipeline, InteractivePipeGUI]:
     """@interactive_pipeline
@@ -46,7 +48,11 @@ def interactive_pipeline(
         else:
             InteractivePipeGui = get_interactive_pipeline_class(gui)
             gui_pipeline = InteractivePipeGui(
-                pipeline=headless_pipeline, name=pipeline_function.__name__, **kwargs_gui)
+                pipeline=headless_pipeline,
+                markdown_description=markdown_description,
+                name=name if name is not None else pipeline_function.__name__,
+                **kwargs_gui
+            )
 
         @ functools.wraps(pipeline_function)
         def inner(*args, **kwargs):

{interactive_pipe-0.8.4 → interactive_pipe-0.8.5/src/interactive_pipe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: interactive_pipe
-Version: 0.8.4
+Version: 0.8.5
 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.4**
+**Version 0.8.5**
 - Modular multi-image processing filters
 - Declarative: Easily make graphical user interface without having to learn anything about pyQt or matplotlib
 - Support in jupyter notebooks