update interactive pipe version

app.py

@@ -1,4 +1,5 @@
 from interactive_pipe import interactive_pipeline, interactive
+from interactive_pipe import CircularControl
 from interactive_pipe.data_objects.curves import SingleCurve, Curve
 from interactive_pipe.data_objects.image import Image
 from global_tone_mapping import apply_s_curve_tone_mapping
@@ -30,7 +31,8 @@ def histogram(img: np.ndarray) -> Curve:
 
 @interactive()
 def set_tone_mapping_params(
-    shadow_boost: float = (0., [-1., 1.]),
+    # shadow_boost: float = (0., [-1., 1.]),
+    shadow_boost: float = CircularControl(0., [-1., 1.]),
     highlight_boost: float = (0., [-1., 1.]),
     exposure: float = (0., [-1., 1.]),
     contrast: float = (0., [-1., 1.]),
@@ -42,7 +44,9 @@ def set_tone_mapping_params(
     global_params["exposure"] = exposure
 
 
-@interactive(apply_tone_curve_on_luma=(True,))
+@interactive(
+    apply_tone_curve_on_luma=(True,)
+)
 def tone_map(
     hsv: np.ndarray,
     apply_tone_curve_on_luma: bool = True,
@@ -127,27 +131,31 @@ def s_curve_visualization(global_params={}) -> Curve:
 
 
 @interactive(
-    input_image=("sample_image", ["sample_image", "color_wheel"]),
+    input_image=("sample image", ["sample image",
+                 "alternative image", "color wheel"]),
 )
 def pick_image(
     default_image: np.ndarray,
-    input_image: str = "sample_image",
+    second_image: np.ndarray,
+    input_image: str = "sample image",
     global_params={}
 ) -> np.ndarray:
-    if input_image == "sample_image":
+    if input_image == "sample image":
         return default_image
-    elif input_image == "color_wheel":
-        color_wheel = global_params.get("color_wheel", None)
+    elif input_image == "alternative image":
+        return second_image
+    elif input_image == "color wheel":
+        color_wheel = global_params.get("color wheel", None)
         if color_wheel is None:
             color_wheel = generate_color_wheel(resolution=496)
-            global_params["color_wheel"] = color_wheel
+            global_params["color wheel"] = color_wheel
         return color_wheel
     else:
         return default_image
 
 
-def image_editing_pipeline(sample_image):
-    input_image = pick_image(sample_image)
+def image_editing_pipeline(sample_image, second_image):
+    input_image = pick_image(sample_image, second_image)
     set_tone_mapping_params()
     hsv_in = rgb_to_hsv(input_image)
     hsv_tc = tone_map(hsv_in)
@@ -163,9 +171,15 @@ if __name__ == "__main__":
     parser.add_argument("-b", "--backend", type=str,
                         choices=["gradio", "qt", "mpl"], default="gradio")
     args = parser.parse_args()
-    img = Image.load_image("image_sample.jpg")
+    img = Image.load_image("image_sample_2.jpg")
+    img2 = Image.load_image("image_sample.jpg")
     markdown_description = r"# Tone mapping: S-curve" + "\n" \
         r"$$\text{shadow boost} \in [-1, 1]$$  $$\text{highlight boost} \in [-1, 1]$$  $$\text{contrast} \in [-1, 1]$$  $$\text{exposure} \in [-1, 1]$$" + "\n" \
         "If Tone curves are applied to RGB colors separately, you'll get serious color shifts. It is much better when tone curve is applied to the luminance channel." + "\n"
-    interactive_pipeline(gui=args.backend, markdown_description=markdown_description)(
-        image_editing_pipeline)(img)
+    interactive_pipeline(
+        gui=args.backend,
+        markdown_description=markdown_description,
+        sliders_layout=["compact", "group",
+                        "vertical", "collapsible", "smart"][2],
+        sliders_per_row_layout=1
+    )(image_editing_pipeline)(img, img2)

requirements.txt

@@ -1 +1 @@
-interactive-pipe
+interactive-pipe>=0.7.3