change backend

README.md

@@ -1,13 +1,13 @@
 ---
 title: AltDiffusion
-emoji: 🌖
-colorFrom: yellow
-colorTo: red
+emoji: 📉
+colorFrom: purple
+colorTo: gray
 sdk: gradio
-sdk_version: 3.4
+sdk_version: 3.10.1
 app_file: app.py
 pinned: false
-license: openrail
+license: creativeml-openrail-m
 ---
 
 Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference

app.py

@@ -1,76 +1,17 @@
-import imp
-import gradio as gr
 import io 
-from PIL import Image, PngImagePlugin
+import re
+import imp
+import time
+import json 
 import base64
 import requests
-import json 
+import gradio as gr
 import ui_functions as uifn
 from css_and_js import js, call_JS
-import re
-from share_btn import community_icon_html, loading_icon_html, share_js
-
-# reload
-txt2img_defaults = {
-    'prompt': '',
-    'ddim_steps': 50,
-    'toggles': [1, 2, 3],
-    'sampler_name': 'k_lms',
-    'ddim_eta': 0.0,
-    'n_iter': 1,
-    'batch_size': 1,
-    'cfg_scale': 7.5,
-    'seed': '',
-    'height': 512,
-    'width': 512,
-    'fp': None,
-    'variant_amount': 0.0,
-    'variant_seed': '',
-    'submit_on_enter': 'Yes',
-}
-
-img2img_defaults = {
-    'prompt': '',
-    'ddim_steps': 50,
-    'toggles': [1, 4, 5],
-    'sampler_name': 'k_lms',
-    'ddim_eta': 0.0,
-    'n_iter': 1,
-    'batch_size': 1,
-    'cfg_scale': 5.0,
-    'denoising_strength': 0.75,
-    'mask_mode': 1,
-    'resize_mode': 0,
-    'seed': '',
-    'height': 512,
-    'width': 512,
-    'fp': None,
-}
-sample_img2img = None
-job_manager = None
-RealESRGAN = True
-show_embeddings = False
-
-img2img_resize_modes = [
-    "Just resize",
-    "Crop and resize",
-    "Resize and fill",
-]
+from PIL import Image, PngImagePlugin, ImageChops
 
-img2img_toggles = [
-    'Create prompt matrix (separate multiple prompts using |, and get all combinations of them)',
-    'Normalize Prompt Weights (ensure sum of weights add up to 1.0)',
-    'Loopback (use images from previous batch when creating next batch)',
-    'Random loopback seed',
-    'Save individual images',
-    'Save grid',
-    'Sort samples by prompt',
-    'Write sample info files',
-    'Write sample info to one file',
-    'jpg samples',
-]
-
-img2img_toggle_defaults = [img2img_toggles[i] for i in img2img_defaults['toggles']]
+url_host = "http://flagstudio.baai.ac.cn"
+token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiZjAxOGMxMzJiYTUyNDBjMzk5NTMzYTI5YjBmMzZiODMiLCJhcHBfbmFtZSI6IndlYiIsImlkZW50aXR5X3R5cGUiOiIyIiwidXNlcl9yb2xlIjoiMiIsImp0aSI6IjVjMmQzMjdiLWI5Y2MtNDhiZS1hZWQ4LTllMjQ4MDk4NzMxYyIsIm5iZiI6MTY2OTAwNjE5NywiZXhwIjoxOTg0MzY2MTk3LCJpYXQiOjE2NjkwMDYxOTd9.9B3MDk8wA6iWH5puXjcD19tJJ4Ox7mdpRyWZs5Kwt70"
 
 def read_content(file_path: str) -> str:
     """read the content of target file
@@ -80,13 +21,6 @@ def read_content(file_path: str) -> str:
 
     return content
 
-def base2picture(resbase64):
-    res=resbase64.split(',')[1]
-    img_b64decode = base64.b64decode(res)
-    image = io.BytesIO(img_b64decode)
-    img = Image.open(image)
-    return img 
-
 def filter_content(raw_style: str):
     if "(" in raw_style:
         i = raw_style.index("(")
@@ -98,105 +32,108 @@ def filter_content(raw_style: str):
     else :
         return raw_style[:i]
 
-def request_images(raw_text, class_draw, style_draw, batch_size, sr_option, w, h, seed):
+def upload_image(img):
+    url = url_host + "/api/v1/image/get-upload-link"
+    headers = {"token": token}
+    r = requests.post(url, json={}, headers=headers)
+    if r.status_code != 200:
+        raise gr.Error(r.reason)
+    head_res = r.json()
+    if head_res["code"] != 0:
+        raise gr.Error("Unknown error")
+    image_id = head_res["data"]["image_id"]
+    image_url = head_res["data"]["url"]
+    image_headers = head_res["data"]["headers"]
+
+    imgBytes = io.BytesIO()
+    img.save(imgBytes, "PNG")
+    imgBytes = imgBytes.getvalue()
+
+    r = requests.put(image_url, data=imgBytes, headers=image_headers)
+    if r.status_code != 200:
+        raise gr.Error(r.reason)
+    return image_id, image_url
+
+def post_reqest(seed, prompt, width, height, image_num, img=None, mask=None):
+    data = {
+            "type": "gen-image",
+            "gen_image_num": image_num,
+            "parameters": {
+                "width": width, # output height width
+                "height": height, # output image height
+                "prompts": [prompt], 
+            }
+        }
+    data["parameters"]["seed"] = int(seed)
+    if img is not None:
+        # Upload image
+        image_id, image_url = upload_image(img)
+        data["parameters"]["init_image"] = {
+                    "image_id": image_id,
+                    "url": image_url,
+                    "width": img.width,
+                    "height": img.height,
+                }
+    if mask is not None:
+        # Upload mask
+        extrama = mask.convert("L").getextrema()
+        if extrama[1] > 0:
+            mask_id, mask_url = upload_image(mask)
+            data["parameters"]["mask_image"] = {
+                        "image_id": mask_id,
+                        "url": mask_url,
+                        "width": mask.width,
+                        "height": mask.height,
+                    }
+    headers = {"token": token}
+    # Send create task request
+    # url = "http://flagstudio.baai.ac.cn/api/v1/task/create"
+    url = url_host+"/api/v1/task/create"
+    r = requests.post(url, json=data, headers=headers)
+    if r.status_code != 200:
+        raise gr.Error(r.reason)
+    create_res = r.json()
+    task_id = create_res["data"]["task_id"]
+
+    # Get result
+    url = url_host+"/api/v1/task/status"
+    while True:
+        r = requests.post(url, json=create_res["data"], headers=headers)
+        if r.status_code != 200:
+            raise gr.Error(r.reason)
+        res = r.json()
+        if res["code"] == 6002:
+            # Running
+            time.sleep(1)
+            continue
+        elif res["code"] == 0:
+            # Finished
+            images = []
+            for img_info in res["data"]["images"]:
+                img_res = requests.get(img_info["url"])
+                images.append(Image.open(io.BytesIO(img_res.content)).convert("RGB"))
+            return images
+        else:
+            raise gr.Error(f"Error code: {res['code']}")
+
+def request_images(raw_text, class_draw, style_draw, batch_size, w, h, seed):
     if filter_content(class_draw) != "国画":
         if filter_content(class_draw) != "通用":
             raw_text = raw_text + f"，{filter_content(class_draw)}"
 
         for sty in style_draw:
             raw_text = raw_text + f"，{filter_content(sty)}"
-        print(f"raw text is {raw_text}")
-        url = "http://flagart.baai.ac.cn/api/general/"
     elif filter_content(class_draw) == "国画":
-        if raw_text.endswith("国画"):
-            pass 
-        else :
-            raw_text = raw_text + "，国画"
-        url = "http://flagart.baai.ac.cn/api/guohua/"
-
-    d = {"data":[raw_text, int(batch_size), sr_option, w, h, seed]}
-    # print('+++++++++right here+++++++')
-    # print(w,h,seed)
-    r = requests.post(url, json=d, headers={"Content-Type": "application/json", "Accept": "*/*", "Accept-Encoding": "gzip, deflate, br", "Connection": "keep-alive"})
-    result_text = r.text
-    content = json.loads(result_text)["data"][0]
-    images = []
-    for i in range(int(batch_size)):
-        # print(content[i])
-        images.append(base2picture(content[i]))        
+        raw_text = raw_text + "，国画，水墨画，大作，黑白，高清，传统"
+    print(f"raw text is {raw_text}")
 
-    return images
-
-def sr_request_images(img_str, idx, w, h, seed):
-    idx_map = {
-            "图片1(img1)":0,
-            "图片2(img2)":1,
-            "图片3(img3)":2,
-            "图片4(img4)":3,
-        }
-    idx = idx_map[idx]
-    # image_data = re.sub('^data:image/.+;base64,', '', img_str[idx])
-    image_data = img_str[idx]
-    # print(image_data)
-    d = {"data":[image_data, 0, False, w, h, seed]} # batch_size设置为0，sr_opt设置为False, 新加了3个参数w,h,seed,随便放就行，进去不会走这个路
-    # print(w,h,seed)
-    url = "http://flagart.baai.ac.cn/api/general/"
-    r = requests.post(url, json=d, headers={"Content-Type": "application/json", "Accept": "*/*", "Accept-Encoding": "gzip, deflate, br", "Connection": "keep-alive"})
-    result_text = r.text
-    # print(result_text)
-    content = json.loads(result_text)["data"][0]
-    # print(content)
-    images = [base2picture(content[0])] 
+    images = post_reqest(seed, raw_text, w, h, int(batch_size))
 
     return images
 
 
-def encode_pil_to_base64(pil_image):
-    with io.BytesIO() as output_bytes:
-
-        # Copy any text-only metadata
-        use_metadata = False
-        metadata = PngImagePlugin.PngInfo()
-        for key, value in pil_image.info.items():
-            if isinstance(key, str) and isinstance(value, str):
-                metadata.add_text(key, value)
-                use_metadata = True
-
-        pil_image.save(
-            output_bytes, "PNG", pnginfo=(metadata if use_metadata else None)
-        )
-        bytes_data = output_bytes.getvalue()
-    base64_str = str(base64.b64encode(bytes_data), "utf-8")
-    return "data:image/png;base64," + base64_str
-
-def img2img(*args):
-    
-    # 处理image
-    for i, item in enumerate(args):
-        # print(type(item))
-        if type(item) == dict:
-            args[i]['image']  = encode_pil_to_base64(item['image'])
-            args[i]['mask'] = encode_pil_to_base64(item['mask'])
-        # else:
-        #     print(i,type(item))
-        #     print(item)
-    
-    batch_size = args[8]
-
-    url = "http://flagart.baai.ac.cn/api/img2img/"
-    d = {"data":args}
-    r = requests.post(url, json=d, headers={"Content-Type": "application/json", "Accept": "*/*", "Accept-Encoding": "gzip, deflate, br", "Connection": "keep-alive"})
-    # print(r)
-    result_text = r.text
-    content = json.loads(result_text)["data"][0]
-    images = []
-    for i in range(batch_size):
-        # print(content[i])
-        images.append(base2picture(content[i]))   
-    # content = json.loads(result_text)
-    # print(result_text)
-    # print("服务器已经把东西返回来啦！！！！！！！乌拉乌拉！！！！！")
-    return images
+def img2img(prompt, image_and_mask):
+    return post_reqest(0, prompt, 512, 512, 1, image_and_mask["image"], image_and_mask["mask"])
 
 
 examples = [
@@ -217,10 +154,6 @@ if __name__ == "__main__":
 
     with block:
         gr.HTML(read_content("header.html"))
-        # with gr.Group(elem_id="share-btn-container"):
-        #         community_icon = gr.HTML(community_icon_html)
-        #         loading_icon = gr.HTML(loading_icon_html)
-        #         share_button = gr.Button("Share to community", elem_id="share-btn")
         with gr.Tabs(elem_id='tabss') as tabs:
 
             with gr.TabItem("文生图(Text-to-img)", id='txt2img_tab'):
@@ -272,32 +205,22 @@ if __name__ == "__main__":
                             #                         interactive=True,
                             #                         )
                             sample_size = gr.Radio(choices=["1","2","3","4"], value="1", show_label=True, label='生成数量(number)')
-                            seed = gr.Number(-1, label='seed', interactive=True)
+                            seed = gr.Number(0, label='seed', interactive=True)
                         with gr.Row().style(mobile_collapse=False, equal_height=True):
                             w = gr.Slider(512,1024,value=512, step=64, label="width")
                             h = gr.Slider(512,1024,value=512, step=64, label="height")
-                        with gr.Row(visible=False).style(mobile_collapse=False, equal_height=True):
-                            sr_option = gr.Checkbox(value=False, label="是否使用超分(Whether to use super-resolution)")
 
                     gallery = gr.Gallery(
                         label="Generated images", show_label=False, elem_id="gallery"
                     ).style(grid=[2,2])
                     gr.Examples(examples=examples, fn=request_images, inputs=text, outputs=gallery, examples_per_page=100)
                     with gr.Row().style(mobile_collapse=False, equal_height=True):
-                        img_choices = gr.Dropdown(["图片1(img1)"],label='请选择一张图片发送到图生图或者超分',show_label=True,value="图片1(img1)")
+                        img_choices = gr.Dropdown(["图片1(img1)"],label='请选择一张图片发送到图生图',show_label=True,value="图片1(img1)")
                     with gr.Row().style(mobile_collapse=False, equal_height=True):
                         output_txt2img_copy_to_input_btn = gr.Button("发送图片到图生图(Sent the image to img2img)").style(
                                 margin=False,
                                 rounded=(True, True, True, True),
                             )
-                        output_txt2img_sr_btn = gr.Button("将选择的图片进行超分(super-resolution)").style(
-                                margin=False,
-                                rounded=(True, True, True, True),
-                            )
-
-                    sr_gallery = gr.Gallery(
-                        label="SR images", show_label=True, elem_id="sr_gallery"
-                    ).style(grid=[1,1])
 
                     with gr.Row():
                         prompt = gr.Markdown("提示(Prompt)：", visible=False)
@@ -308,16 +231,8 @@ if __name__ == "__main__":
 
                         
 
-                    # 并没有什么软用，转跳还是很卡，而且只能转跳一次
-                    # go_to_img2img_btn = gr.Button("转至图生图(Go to img2img)").style(
-                    #             margin=False,
-                    #             rounded=(True, True, True, True),
-                    #         )
-
-                    text.submit(request_images, inputs=[text, class_draw, style_draw, sample_size, sr_option, w, h, seed], outputs=gallery)
-                    btn.click(request_images, inputs=[text, class_draw, style_draw, sample_size, sr_option, w, h, seed], outputs=gallery)
-                    # to do here
-                    output_txt2img_sr_btn.click(sr_request_images, inputs=[gallery, img_choices, w, h, seed], outputs=[sr_gallery])
+                    text.submit(request_images, inputs=[text, class_draw, style_draw, sample_size, w, h, seed], outputs=gallery)
+                    btn.click(request_images, inputs=[text, class_draw, style_draw, sample_size, w, h, seed], outputs=gallery)
 
                     sample_size.change(
                         fn=uifn.change_img_choices,
@@ -331,8 +246,8 @@ if __name__ == "__main__":
                                                 elem_id='img2img_prompt_input',
                                                 placeholder="神奇的森林，流淌的河流.",
                                                 lines=1,
-                                                max_lines=1 if txt2img_defaults['submit_on_enter'] == 'Yes' else 25,
-                                                value=img2img_defaults['prompt'],
+                                                max_lines=1,
+                                                value="",
                                                 show_label=False).style()
 
                     img2img_btn_mask = gr.Button("Generate", variant="primary", visible=False,
@@ -342,7 +257,7 @@ if __name__ == "__main__":
                 with gr.Row().style(equal_height=False):
                     #with gr.Column():
                     img2img_image_mask = gr.Image(
-                        value=sample_img2img,
+                        value=None,
                         source="upload",
                         interactive=True,
                         tool="sketch",
@@ -350,71 +265,10 @@ if __name__ == "__main__":
                         elem_id="img2img_mask",
                         image_mode="RGBA"
                     )
-                    img2img_image_editor = gr.Image(
-                        value=sample_img2img,
-                        source="upload",
-                        interactive=True,
-                        tool="select",
-                        type='pil',
-                        visible=False,
-                        image_mode="RGBA",
-                        elem_id="img2img_editor"
-                    )
-                    with gr.Tabs(visible=False):
-                        with gr.TabItem("编辑设置"):
-                            with gr.Row():
-                                # disable Uncrop for now
-                                choices=["Mask", "Crop", "Uncrop"]
-                                img2img_image_editor_mode = gr.Radio(choices=["Mask"],
-                                                                        label="编辑模式",
-                                                                        value="Mask", elem_id='edit_mode_select',
-                                                                        visible=True)
-                                img2img_mask = gr.Radio(choices=["保留mask区域", "生成mask区域"],
-                                                        label="Mask 方式",
-                                                        #value=img2img_mask_modes[img2img_defaults['mask_mode']],
-                                                        value = "生成mask区域",
-                                                        visible=True)
-
-                                img2img_mask_blur_strength = gr.Slider(minimum=1, maximum=10, step=1,
-                                                                        label="How much blurry should the mask be? (to avoid hard edges)",
-                                                                        value=3, visible=False)
-
-                                img2img_resize = gr.Radio(label="Resize mode",
-                                                            choices=["Just resize", "Crop and resize",
-                                                                    "Resize and fill"],
-                                                            value=img2img_resize_modes[
-                                                                img2img_defaults['resize_mode']], visible=False)
-
-                            img2img_painterro_btn = gr.Button("Advanced Editor",visible=False)
-                        # with gr.TabItem("Hints",visible=False):
-                        #     img2img_help = gr.Markdown(visible=False, value=uifn.help_text)
                 gr.Markdown('#### 编辑后的图片')
                 with gr.Row():
                     output_img2img_gallery = gr.Gallery(label="Images", elem_id="img2img_gallery_output").style(
                         grid=[4,4,4] )
-                    img2img_job_ui = job_manager.draw_gradio_ui() if job_manager else None
-                    with gr.Column(visible=False):
-                        with gr.Tabs(visible=False):
-                            with gr.TabItem("", id="img2img_actions_tab",visible=False):
-                                gr.Markdown("Select an image, then press one of the buttons below")
-                                with gr.Row():
-                                    output_img2img_copy_to_clipboard_btn = gr.Button("Copy to clipboard")
-                                    output_img2img_copy_to_input_btn = gr.Button("Push to img2img input")
-                                    output_img2img_copy_to_mask_btn = gr.Button("Push to img2img input mask")
-
-                                gr.Markdown("Warning: This will clear your current image and mask settings!")
-                            with gr.TabItem("", id="img2img_output_info_tab",visible=False):
-                                output_img2img_params = gr.Textbox(label="Generation parameters")
-                                with gr.Row():
-                                    output_img2img_copy_params = gr.Button("Copy full parameters").click(
-                                        inputs=output_img2img_params, outputs=[],
-                                        _js='(x) => {navigator.clipboard.writeText(x.replace(": ",":"))}', fn=None,
-                                        show_progress=False)
-                                    output_img2img_seed = gr.Number(label='Seed', interactive=False, visible=False)
-                                    output_img2img_copy_seed = gr.Button("Copy only seed").click(
-                                        inputs=output_img2img_seed, outputs=[],
-                                        _js=call_JS("gradioInputToClipboard"), fn=None, show_progress=False)
-                                output_img2img_stats = gr.HTML(label='Stats')
                 with gr.Row():
                     gr.Markdown('提示(prompt):')
                 with gr.Row():
@@ -423,129 +277,18 @@ if __name__ == "__main__":
                     gr.Markdown('Please select an image to cover up a part of the area and enter a text description.')
                 gr.Markdown('# 编辑设置',visible=False)
 
-                with gr.Row(visible=False):
-                    with gr.Column():
-                        img2img_width = gr.Slider(minimum=64, maximum=2048, step=64, label="图片宽度",
-                                                  value=img2img_defaults["width"])
-                        img2img_height = gr.Slider(minimum=64, maximum=2048, step=64, label="图片高度",
-                                                   value=img2img_defaults["height"])
-                        img2img_cfg = gr.Slider(minimum=-40.0, maximum=30.0, step=0.5,
-                                                label='文本引导强度',
-                                                value=img2img_defaults['cfg_scale'], elem_id='cfg_slider')
-                        img2img_seed = gr.Textbox(label="随机种子", lines=1, max_lines=1,
-                                                  value=img2img_defaults["seed"])
-                        img2img_batch_count = gr.Slider(minimum=1, maximum=50, step=1,
-                                                        label='生成数量',
-                                                        value=img2img_defaults['n_iter'])
-                        img2img_dimensions_info_text_box = gr.Textbox(
-                            label="长宽比设置")
-                    with gr.Column():
-                        img2img_steps = gr.Slider(minimum=1, maximum=250, step=1, label="采样步数",
-                                                  value=img2img_defaults['ddim_steps'])
-
-                        img2img_sampling = gr.Dropdown(label='采样方式',
-                                                       choices=["DDIM", 'k_dpm_2_a', 'k_dpm_2', 'k_euler_a', 'k_euler',
-                                                                'k_heun', 'k_lms'],
-                                                       value=img2img_defaults['sampler_name'])
-
-                        img2img_denoising = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising Strength',
-                                                      value=img2img_defaults['denoising_strength'],visible=False)
-
-                        img2img_toggles = gr.CheckboxGroup(label='', choices=img2img_toggles,
-                                                           value=img2img_toggle_defaults,visible=False)
-
-                        img2img_realesrgan_model_name = gr.Dropdown(label='RealESRGAN model',
-                                                                    choices=['RealESRGAN_x4plus',
-                                                                             'RealESRGAN_x4plus_anime_6B'],
-                                                                    value='RealESRGAN_x4plus',
-                                                                    visible=RealESRGAN is not None)  # TODO: Feels like I shouldnt slot it in here.
-
-                        img2img_embeddings = gr.File(label="Embeddings file for textual inversion",
-                                                     visible=show_embeddings)
-
-                img2img_image_editor_mode.change(
-                    uifn.change_image_editor_mode,
-                    [img2img_image_editor_mode,
-                     img2img_image_editor,
-                     img2img_image_mask,
-                     img2img_resize,
-                     img2img_width,
-                     img2img_height
-                     ],
-                    [img2img_image_editor, img2img_image_mask, img2img_btn_editor, img2img_btn_mask,
-                     img2img_painterro_btn, img2img_mask, img2img_mask_blur_strength]
-                )
-                
-                # 这个函数之前注释掉了，但是没有出现bug，看一下这个的作用；
-                img2img_image_editor_mode.change(
-                    uifn.update_image_mask,
-                    [img2img_image_editor, img2img_resize, img2img_width, img2img_height],
-                    img2img_image_mask
-                )
 
-                # 把上面这个注释掉下面就不管用了，很神奇无法理解... 后来又好了
-                # output_txt2img_copy_to_input_btn.click(
-                #     uifn.copy_img_to_input,
-                #     [gallery],
-                #     [tabs, img2img_image_editor, img2img_image_mask],
-                #     _js=call_JS("moveImageFromGallery",
-                #                 fromId="txt2img_gallery_output",
-                #                 toId="img2img_mask")
-                # )
                 output_txt2img_copy_to_input_btn.click(
                     uifn.copy_img_to_input,
                     [gallery, img_choices],
-                    [tabs, img2img_image_editor, img2img_image_mask, move_prompt_zh, move_prompt_en, prompt]
+                    [tabs, img2img_image_mask, move_prompt_zh, move_prompt_en, prompt]
                 )
 
-                # go_to_img2img_btn.click(
-                #     uifn.go_to_img2img,
-                #     [],
-                #     [tabs],
-                # )
-                
-                # 下面这几个函数现在都没什么用
-                output_img2img_copy_to_input_btn.click(
-                    uifn.copy_img_to_edit,
-                    [output_img2img_gallery],
-                    [img2img_image_editor, tabs, img2img_image_editor_mode],
-                    _js=call_JS("moveImageFromGallery",
-                                fromId="gallery",
-                                toId="img2img_editor")
-                )
-                output_img2img_copy_to_mask_btn.click(
-                    uifn.copy_img_to_mask,
-                    [output_img2img_gallery],
-                    [img2img_image_mask, tabs, img2img_image_editor_mode],
-                    _js=call_JS("moveImageFromGallery",
-                                fromId="img2img_gallery_output",
-                                toId="img2img_editor")
-                )
-
-                output_img2img_copy_to_clipboard_btn.click(fn=None, inputs=output_img2img_gallery, outputs=[],
-                                                           _js=call_JS("copyImageFromGalleryToClipboard",
-                                                                       fromId="img2img_gallery_output")
-                                                           )
 
                 img2img_func = img2img
-                img2img_inputs = [img2img_prompt, img2img_image_editor_mode, img2img_mask,
-                                  img2img_mask_blur_strength, img2img_steps, img2img_sampling, img2img_toggles,
-                                  img2img_realesrgan_model_name, img2img_batch_count, img2img_cfg,
-                                  img2img_denoising, img2img_seed, img2img_height, img2img_width, img2img_resize,
-                                  img2img_image_mask]
-                # img2img_outputs = [output_img2img_gallery, output_img2img_seed, output_img2img_params,
-                #                    output_img2img_stats]
-
+                img2img_inputs = [img2img_prompt, img2img_image_mask]
                 img2img_outputs = [output_img2img_gallery]
 
-                # If a JobManager was passed in then wrap the Generate functions
-                if img2img_job_ui:
-                    img2img_func, img2img_inputs, img2img_outputs = img2img_job_ui.wrap_func(
-                        func=img2img_func,
-                        inputs=img2img_inputs,
-                        outputs=img2img_outputs,
-                    )
-
                 img2img_btn_mask.click(
                     img2img_func,
                     img2img_inputs,
@@ -553,11 +296,6 @@ if __name__ == "__main__":
                 )
 
                 def img2img_submit_params():
-                    # print([img2img_prompt, img2img_image_editor_mode, img2img_mask,
-                    #              img2img_mask_blur_strength, img2img_steps, img2img_sampling, img2img_toggles,
-                    #              img2img_realesrgan_model_name, img2img_batch_count, img2img_cfg,
-                    #              img2img_denoising, img2img_seed, img2img_height, img2img_width, img2img_resize,
-                    #              img2img_image_editor, img2img_image_mask, img2img_embeddings])
                     return (img2img_func,
                             img2img_inputs,
                             img2img_outputs)
@@ -569,25 +307,7 @@ if __name__ == "__main__":
                                       _js=call_JS("clickFirstVisibleButton",
                                                   rowId="prompt_row"))
 
-                img2img_painterro_btn.click(None,
-                                            [img2img_image_editor, img2img_image_mask, img2img_image_editor_mode],
-                                            [img2img_image_editor, img2img_image_mask],
-                                            _js=call_JS("Painterro.init", toId="img2img_editor")
-                                            )
-
-                img2img_width.change(fn=uifn.update_dimensions_info, inputs=[img2img_width, img2img_height],
-                                     outputs=img2img_dimensions_info_text_box)
-                img2img_height.change(fn=uifn.update_dimensions_info, inputs=[img2img_width, img2img_height],
-                                      outputs=img2img_dimensions_info_text_box)
-
-                # share_button.click(
-                #                 None,
-                #                 [],
-                #                 [],
-                #                 _js=share_js,
-                #             )
-
         gr.HTML(read_content("footer.html"))
         # gr.Image('./contributors.png')
 
-    block.queue(max_size=50, concurrency_count=20).launch()
+    block.queue(max_size=50, concurrency_count=20).launch()

ui_functions.py

@@ -96,16 +96,16 @@ def copy_img_to_input(img, idx):
             "图片4(img4)":3,
         }
         idx = idx_map[idx]
-        image_data = re.sub('^data:image/.+;base64,', '', img[idx])
-        processed_image = Image.open(BytesIO(base64.b64decode(image_data)))
+        assert img[idx]['is_file']
+        processed_image = Image.open(img[idx]['name'])
         tab_update = gr.update(selected='img2img_tab')
-        img_update = gr.update(value=processed_image)
         move_prompt_zh_update = gr.update(visible=True)
         move_prompt_en_update = gr.update(visible=True)
         prompt_update = gr.update(visible=True)
-        return tab_update,processed_image, processed_image, move_prompt_zh_update, move_prompt_en_update, prompt_update
-    except IndexError:
-        return [None, None]
+        return tab_update, processed_image, move_prompt_zh_update, move_prompt_en_update, prompt_update
+    except IndexError as e:
+        raise gr.Error(e)
+        return [None, None, None, None, None]
 
 def copy_img_to_edit(img):
     try: