diff --git a/README.md b/README.md index 179a8f7..ccae5b0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This extension aim for connecting [AUTOMATIC1111 Stable Diffusion WebUI](https:/ - `2023/04/18`: [Feature] [ControlNet V1.1](https://github.com/lllyasviel/ControlNet-v1-1-nightly) inpainting support released! You can copy SAM generated masks to ControlNet to do inpainting. Note that you **must** update [ControlNet extension](https://github.com/Mikubill/sd-webui-controlnet) to use it. ControlNet inpainting has far better performance compared to general-purposed models, and you do not need to download inpainting-specific models anymore. - `2023/04/24`: [Feature] Automatic segmentation support released! Functionalities with * require you to have [ControlNet extension](https://github.com/Mikubill/sd-webui-controlnet) installed. This update includes support for - *[ControlNet V1.1](https://github.com/lllyasviel/ControlNet-v1-1-nightly) semantic segmentation - - [Edit-Anything](https://github.com/sail-sg/EditAnything) un-semantic segmentation (Not tested) + - [EditAnything](https://github.com/sail-sg/EditAnything) un-semantic segmentation (Not tested) - Image layout generation (single image + batch process) - *Image masking with categories (single image + batch process) - *Inpaint not masked for ControlNet inpainting on txt2img panel @@ -43,7 +43,7 @@ You should know the following before submitting an issue. 4. It is impossible to support [color inpainting](https://github.com/continue-revolution/sd-webui-segment-anything/issues/22) at this moment, because gradio wierdly enlarge the input image which slows down your browser, or even freeze your page. I have already implemented this feature, though, but I made it invisible. Note that ControlNet v1.1 inpainting model is very strong, and you do not need to rely on the traditional inpainting anymore. ControlNet v1.1 does not support color inpainting. -5. [Inpaint-Anything](https://github.com/geekyutao/Inpaint-Anything) and [Edit-Anything](https://github.com/sail-sg/EditAnything) and A LOT of other popular SAM extensions have been supported. For Inpaint-Anything, you may check [this issue](https://github.com/continue-revolution/sd-webui-segment-anything/issues/60) for how to use. For Edit-Anything, this extension has **in-theory** supported, but since they only published diffusers models which probably only work for SD 2.x + [diffusers package](https://github.com/huggingface/diffusers), I am unable to test at this moment. I will update once they release models in lllyasviel format. I am always open to support any other interesting applications, submit a feature request if you find another interesting one. +5. [Inpaint-Anything](https://github.com/geekyutao/Inpaint-Anything) and [EditAnything](https://github.com/sail-sg/EditAnything) and A LOT of other popular SAM extensions have been supported. For Inpaint-Anything, you may check [this issue](https://github.com/continue-revolution/sd-webui-segment-anything/issues/60) for how to use. For EditAnything, this extension has **in-theory** supported, but since they only published diffusers models which probably only work for SD 2.x + [diffusers package](https://github.com/huggingface/diffusers), I am unable to test at this moment. I will update once they release models in lllyasviel format. I am always open to support any other interesting applications, submit a feature request if you find another interesting one. 6. If you have a job opportunity and think I am a good fit, please feel free to send me an email. diff --git a/scripts/auto.py b/scripts/auto.py index 19a0e27..8ea07aa 100644 --- a/scripts/auto.py +++ b/scripts/auto.py @@ -297,7 +297,5 @@ def pixel_perfect_lllyasviel(input_image, processor_res, use_pixel_perfect, resi print(f'target_H = {target_H}') print(f'target_W = {target_W}') print(f'estimation = {estimation}') - elif processor_res <= 64: - preprocessor_resolution = 512 print(f'preprocessor resolution = {preprocessor_resolution}') return preprocessor_resolution diff --git a/scripts/process_params.py b/scripts/process_params.py index cae9254..1a5da03 100644 --- a/scripts/process_params.py +++ b/scripts/process_params.py @@ -102,7 +102,7 @@ def set_process_attributes(self, p): if len(self.cnet_seg_output_gallery) == 3 and self.cnet_seg_gallery_input is not None: cnet_seg_gallery_index += self.cnet_seg_gallery_input self.set_p_value(p, 'control_net_input_image', self.cnet_seg_idx, - Image.open(self.cnet_seg_output_gallery[1]['name'])) + Image.open(self.cnet_seg_output_gallery[cnet_seg_gallery_index]['name'])) def set_p_value(self, p, attr: str, idx: int, v):