adjust

app.py

@@ -140,10 +140,8 @@ def control_ui():
             with gr.Tab('局部重绘', elem_id="inp_block") as inp:
                 overlay = gr.Checkbox(label='覆盖原图', value=True)
                 inp_img = gr.ImageMask(label="上传图片", value=None, sources=["upload", "clipboard", "webcam"], interactive=True, type="pil", eraser=False, transforms=None, brush=gr.Brush(colors=['#FFFFFF'], color_mode='fixed'), layers=False, show_share_button=False, show_download_button=False)
-                inp_str = gr.Slider(label="重绘强度", value=1, minimum=0.01, maximum=1, step=0.01, visible=False)
+                inp_str = gr.Slider(label="重绘强度", value=1, minimum=0.01, maximum=1, step=0.01)
                 reuse_img_inp = gr.Button(value='使用上一次生成的图片')
-                model.change(lambda m, i: gr.update(visible=m.startswith('nai-diffusion-4') and (i != None)), inputs=[model, inp_img], outputs=inp_str)
-                inp_img.change(lambda m, i: gr.update(visible=m.startswith('nai-diffusion-4') and (i != None)), inputs=[model, inp_img], outputs=inp_str)
             selection = gr.Radio(choices=['i2i', 'inp'], value='i2i', visible=False)
         with gr.Accordion("角色控制（仅nai4有效）", open=False, elem_id="v4chars_tab") as chars:
             with gr.Row():

utils.py

@@ -106,7 +106,6 @@ def generate_novelai_image(
             "ucPreset": 0,
             "cfg_rescale": cfg_rescale,
             "controlnet_strength": 1,
-            "inpaintImg2ImgStrength": inp_str,
             "dynamic_thresholding": dyn_threshold,
             "params_version": 3,
             "legacy": False,
@@ -152,6 +151,8 @@ def generate_novelai_image(
         payload['parameters']['mask'] = image2base64(mask)
         payload['parameters']['image'] = image2base64(inp_img['background'])
         payload['parameters']['extra_noise_seed'] = seed
+        payload['parameters']['inpaintImg2ImgStrength'] = inp_str
+        payload['parameters']['img2img'] = {'strength': inp_str, 'color_correct': True}
     if i2i_image != None and selection == 'i2i':
         payload['action'] = "img2img"
         payload['parameters']['image'] = image2base64(i2i_image)