From 70479479b314aa84dc37bda01a44988adabdb9b4 Mon Sep 17 00:00:00 2001
From: Gourieff <777@lovemet.ru>
Date: Fri, 24 Nov 2023 23:02:00 +0700
Subject: [PATCH] HotFIX: Compatibility with "sd-face-editor"

Issue #211
Because Reactor's Mask Correction is based on sd-face-editor masking script - we need another naming of active folders

+VersionUP (0.5.1 beta3)
---
 README.md                                                   | 2 +-
 README_RU.md                                                | 2 +-
 modules/reactor_mask.py                                     | 6 +++---
 scripts/{entities => reactor_entities}/face.py              | 2 +-
 scripts/{entities => reactor_entities}/rect.py              | 0
 .../bisenet_mask_generator.py                               | 2 +-
 .../{inferencers => reactor_inferencers}/mask_generator.py  | 0
 scripts/reactor_version.py                                  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename scripts/{entities => reactor_entities}/face.py (98%)
 rename scripts/{entities => reactor_entities}/rect.py (100%)
 rename scripts/{inferencers => reactor_inferencers}/bisenet_mask_generator.py (97%)
 rename scripts/{inferencers => reactor_inferencers}/mask_generator.py (100%)

diff --git a/README.md b/README.md
index 06586a0..3515ce2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
   <img src="https://github.com/Gourieff/Assets/raw/main/sd-webui-reactor/ReActor_logo_red.png?raw=true" alt="logo" width="180px"/>
     
-  ![Version](https://img.shields.io/badge/version-0.5.1_beta2-green?style=for-the-badge&labelColor=darkgreen)
+  ![Version](https://img.shields.io/badge/version-0.5.1_beta3-green?style=for-the-badge&labelColor=darkgreen)
   
   <a href='https://ko-fi.com/gourieff' target='_blank'><img height='33' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
   
diff --git a/README_RU.md b/README_RU.md
index 9ccd906..93dc2f1 100644
--- a/README_RU.md
+++ b/README_RU.md
@@ -2,7 +2,7 @@
 
   <img src="https://github.com/Gourieff/Assets/raw/main/sd-webui-reactor/ReActor_logo_red.png?raw=true" alt="logo" width="180px"/>
     
-  ![Version](https://img.shields.io/badge/версия-0.5.1_beta2-green?style=for-the-badge&labelColor=darkgreen)
+  ![Version](https://img.shields.io/badge/версия-0.5.1_beta3-green?style=for-the-badge&labelColor=darkgreen)
   
   <a href='https://ko-fi.com/gourieff' target='_blank'><img height='33' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
   
diff --git a/modules/reactor_mask.py b/modules/reactor_mask.py
index 5f939d1..4109989 100644
--- a/modules/reactor_mask.py
+++ b/modules/reactor_mask.py
@@ -5,9 +5,9 @@ from PIL import Image, ImageDraw
 from torchvision.transforms.functional import to_pil_image
 
 from scripts.reactor_logger import logger
-from scripts.inferencers.bisenet_mask_generator import BiSeNetMaskGenerator
-from scripts.entities.face import FaceArea
-from scripts.entities.rect import Rect
+from scripts.reactor_inferencers.bisenet_mask_generator import BiSeNetMaskGenerator
+from scripts.reactor_entities.face import FaceArea
+from scripts.reactor_entities.rect import Rect
 
 
 colors = [
diff --git a/scripts/entities/face.py b/scripts/reactor_entities/face.py
similarity index 98%
rename from scripts/entities/face.py
rename to scripts/reactor_entities/face.py
index 8ba1f7e..4c7a784 100644
--- a/scripts/entities/face.py
+++ b/scripts/reactor_entities/face.py
@@ -6,7 +6,7 @@ from modules import images
 from PIL import Image
 
 
-from scripts.entities.rect import Point, Rect
+from scripts.reactor_entities.rect import Point, Rect
 
 
 class FaceArea:
diff --git a/scripts/entities/rect.py b/scripts/reactor_entities/rect.py
similarity index 100%
rename from scripts/entities/rect.py
rename to scripts/reactor_entities/rect.py
diff --git a/scripts/inferencers/bisenet_mask_generator.py b/scripts/reactor_inferencers/bisenet_mask_generator.py
similarity index 97%
rename from scripts/inferencers/bisenet_mask_generator.py
rename to scripts/reactor_inferencers/bisenet_mask_generator.py
index 3de09e8..576c8c1 100644
--- a/scripts/inferencers/bisenet_mask_generator.py
+++ b/scripts/reactor_inferencers/bisenet_mask_generator.py
@@ -7,7 +7,7 @@ import torch
 from facexlib.parsing import init_parsing_model
 from facexlib.utils.misc import img2tensor
 from torchvision.transforms.functional import normalize
-from scripts.inferencers.mask_generator import MaskGenerator
+from scripts.reactor_inferencers.mask_generator import MaskGenerator
 
 class BiSeNetMaskGenerator(MaskGenerator):
     def __init__(self) -> None:
diff --git a/scripts/inferencers/mask_generator.py b/scripts/reactor_inferencers/mask_generator.py
similarity index 100%
rename from scripts/inferencers/mask_generator.py
rename to scripts/reactor_inferencers/mask_generator.py
diff --git a/scripts/reactor_version.py b/scripts/reactor_version.py
index 1c1c0c8..51869bc 100644
--- a/scripts/reactor_version.py
+++ b/scripts/reactor_version.py
@@ -1,5 +1,5 @@
 app_title = "ReActor"
-version_flag = "v0.5.1-b2"
+version_flag = "v0.5.1-b3"
 
 from scripts.reactor_logger import logger, get_Run, set_Run