update ui

app.py

@@ -3,6 +3,8 @@ import gradio as gr
 import subprocess
 from PIL import Image,ImageEnhance,ImageFilter
 import json
+import numpy as np
+from skimage.exposure  import match_histograms
 
 import mp_box
 '''
@@ -20,6 +22,12 @@ Bacause this is part of getting-landmark program and need control face edge.
 So I don't know which one is better.never compare these.
 '''
 
+def color_match(base_image,cropped_image):
+    reference = np.array(base_image)
+    target =np.array(cropped_image)
+    matched = match_histograms(target, reference,channel_axis=-1)
+    return Image.fromarray(matched)
+
 def select_box(boxes,box_type):
     if box_type == "type-3":
          box = boxes[2]
@@ -34,11 +42,12 @@ def select_box(boxes,box_type):
     box = mp_box.xywh_to_xyxy(box)
     return box,box_width,box_height
 
-def process_images(image,replace_image=None,replace_image_need_crop=False,box_type="type-3",fill_color_mode=False,fill_color="black",custom_color="rgba(255,255,255,1)",image_size=1024,filter_image=False,filter_value="Sharpen",progress=gr.Progress(track_tqdm=True)):
+def process_images(image,replace_image=None,replace_image_need_crop=False,box_type="type-3",fill_color_mode=False,fill_color="black",custom_color="rgba(255,255,255,1)",image_size=1024,margin_percent=0,filter_value="None",match_color=True,progress=gr.Progress(track_tqdm=True)):
     if image == None:
         raise gr.Error("Need Image")
 
     # choose box
+    image_width,image_height = image.size
     boxes,mp_image,face_landmarker_result = mp_box.mediapipe_to_box(image)
     box,box_width,box_height = select_box(boxes,box_type)
 
@@ -50,22 +59,52 @@ def process_images(image,replace_image=None,replace_image_need_crop=False,box_ty
             replace_boxes,mp_image,face_landmarker_result = mp_box.mediapipe_to_box(replace_image)
             replace_box,replace_box_width,replace_box_height = select_box(replace_boxes,box_type)
 
+        # this is for fill_color_mode exported image
         if fill_color_mode:
             if replace_image_need_crop:
                 cropped = replace_image.crop(replace_box)
-                cropped.resize(box_width,box_height)
+                cropped.resize((box_width,box_height))
             else:
                 cropped = replace_image.crop(box)
+
+            if match_color:
+                cropped = color_match(image.crop(box),cropped)
+            #just paste base-face area
             image.paste(cropped,[box[0],box[1]])
             return image
         else:#scale mode
+                # box expand by margin
+            if margin_percent>0:
+                h_margin = int(box_width*margin_percent/100)
+                v_margin = int(box_height*margin_percent/100)
+
+                box[0] = max(0,box[0]-h_margin)
+                box[1] = max(0,box[1]-v_margin)
+                box[2] = min(image_width-1,box[2]+h_margin)
+                box[3] = min(image_height-1,box[3]+v_margin)
+                box_width = box[2]-box[0]
+                box_height = box[3]-box[1]
+
             if replace_image_need_crop:
                 replace_image = replace_image.crop(replace_box)
             replace_resized = replace_image.resize((box_width,box_height),Image.Resampling.LANCZOS)
+            if match_color:
+                replace_resized = color_match(image.crop(box),replace_resized)
+            
             image.paste(replace_resized,[box[0],box[1]])
             return image
 
 
+    # box expand by margin
+    if margin_percent>0:
+        h_margin = int(box_width*margin_percent/100)
+        v_margin = int(box_height*margin_percent/100)
+
+        box[0] = max(0,box[0]-h_margin)
+        box[1] = max(0,box[1]-v_margin)
+        box[2] = min(image_width-1,box[2]+h_margin)
+        box[3] = min(image_height-1,box[3]+v_margin)
+    
     # crop-mode
     if fill_color_mode:
         # choose color
@@ -93,12 +132,16 @@ def process_images(image,replace_image=None,replace_image_need_crop=False,box_ty
         #scale up mode
         cropped = image.crop(box)
         resized = resize_image_by_max_dimension(cropped,image_size)
+        
         filter_map={
+           "None":None,
            "Blur":ImageFilter.BLUR,"Smooth More":ImageFilter.SMOOTH_MORE,"Smooth":ImageFilter.SMOOTH,"Sharpen":ImageFilter.SHARPEN,"Edge Enhance":ImageFilter.EDGE_ENHANCE,"Edge Enhance More":ImageFilter.EDGE_ENHANCE_MORE
         }
+
         if filter_value not in filter_map:
             raise gr.Error(f"filter {filter_value} not found")
-        if filter_image:
+        
+        if filter_value != "None":
            
             #resized = resized.filter(ImageFilter.SHARPEN)
             #Gimp's weak 0.1-0.2?
@@ -161,15 +204,20 @@ css="""
 #css=css,
 def update_button_label(image):
     if image == None:
-        return  gr.Button(visible=bool(0)),gr.Button(visible=bool(1))
+        print("none replace")
+        return  gr.Button(visible=True),gr.Button(visible=False),gr.Row(visible=True),gr.Row(visible=True)
     else:
-        return  gr.Button(visible=bool(1)),gr.Row(visible=bool(0))   
+        return  gr.Button(visible=False),gr.Button(visible=True),gr.Row(visible=False),gr.Row(visible=False)
     
-def update_visible(fill_color_mode):
+def update_visible(fill_color_mode,image):
+     if image != None:
+          return  gr.Row(visible=False),gr.Row(visible=False)
+     
      if fill_color_mode:
-        return  gr.Row(visible=bool(0)),gr.Row(visible=bool(1))
+        return  gr.Row(visible=False),gr.Row(visible=True)
      else:
-        return  gr.Row(visible=bool(1)),gr.Row(visible=bool(0))    
+        return  gr.Row(visible=True),gr.Row(visible=False)
+     
 with gr.Blocks(css=css, elem_id="demo-container") as demo:
     with gr.Column():
         gr.HTML(read_file("demo_header.html"))
@@ -185,13 +233,23 @@ with gr.Blocks(css=css, elem_id="demo-container") as demo:
                             
                     replace_image = gr.Image(sources=['upload','clipboard'],image_mode='RGB',elem_id="replace_upload", type="pil", label="replace image")
                     replace_image_need_crop = gr.Checkbox(label="Replace image need crop",value=False)
-                    replace_image.change(update_visible,replace_image,[btn1,btn2])
+                    
                     with gr.Accordion(label="Advanced Settings", open=False):
-                        fill_color_mode = gr.Checkbox(label="Fill Color Mode",value=False)
+                        with gr.Row(equal_height=True):
+                            fill_color_mode = gr.Checkbox(label="Fill Color Mode/No Resize",value=False)
+                            match_color = gr.Checkbox(label="Match Color",value=True)
+                            margin_percent = gr.Slider(
+                                label="Margin percent",info = "add extra space",
+                                minimum=0,
+                                maximum=200,
+                                step=1,
+                                value=0,
+                                interactive=True)
+                        
+                        
                         row1 = gr.Row(equal_height=True)
                         row2 = gr.Row(equal_height=True,visible=False)
-                        fill_color_mode.change(update_visible,fill_color_mode,[row1,row2])
-                        
+                        fill_color_mode.change(update_visible,[fill_color_mode,replace_image],[row1,row2])
                         with row1:
                             image_size = gr.Slider(
                             label="Image Size",info = "cropped face size",
@@ -201,14 +259,16 @@ with gr.Blocks(css=css, elem_id="demo-container") as demo:
                             value=1024,
                             interactive=True)
 
-                            filter_image = gr.Checkbox(label="Filter image")
-                            filter_value = gr.Dropdown(label="Filter",value="Sharpen",choices=["Blur","Smooth More","Smooth","Sharpen","Edge Enhance","Edge Enhance More"])
+                            
+
+                            #filter_image = gr.Checkbox(label="Filter image")
+                            filter_value = gr.Dropdown(label="Filter",value="None",choices=["Blur","Smooth More","Smooth","None","Sharpen","Edge Enhance","Edge Enhance More"])
                         with row2:
                             
-                            fill_color = gr.Dropdown(label="fill color",choices=["black","white","red","brown","pink","custom"])
+                            fill_color = gr.Dropdown(label="fill color",choices=["black","white","red","brown","pink","custom"],value="pink")
                             custom_color = gr.ColorPicker(label="custom color",value="rgba(250, 218, 205, 1)")
                             
-                    
+                    replace_image.change(update_button_label,replace_image,[btn1,btn2,row1,row2])#margin_percent
                 with gr.Column():
                     image_out = gr.Image(label="Output", elem_id="output-img")
                     
@@ -219,7 +279,7 @@ with gr.Blocks(css=css, elem_id="demo-container") as demo:
     
     gr.on(
         [btn1.click,btn2.click],
-        fn=process_images, inputs=[image,replace_image,replace_image_need_crop,box_type,fill_color_mode,fill_color,custom_color,image_size,filter_image,filter_value], outputs =[image_out], api_name='infer'
+        fn=process_images, inputs=[image,replace_image,replace_image_need_crop,box_type,fill_color_mode,fill_color,custom_color,image_size,margin_percent,filter_value,match_color], outputs =[image_out], api_name='infer'
     )
     gr.Examples(
                 examples =["examples/00004200.jpg"],