Upload folder using huggingface_hub

inference.py

@@ -470,6 +470,7 @@ def replace_bg(task: Task):
         steps=task.get_steps(),
         resize_dimension=task.get_resize_dimension(),
         product_scale_width=task.get_image_scale(),
+        apply_high_res=task.get_high_res_fix(),
         conditioning_scale=task.rbg_controlnet_conditioning_scale(),
     )
 
@@ -502,7 +503,7 @@ def load_model_by_task(task: Task):
         safety_checker.apply(text2img_pipe)
         safety_checker.apply(img2img_pipe)
     elif task.get_type() == TaskType.REPLACE_BG:
-        replace_background.load(controlnet=controlnet)
+        replace_background.load(controlnet=controlnet, high_res=high_res)
     else:
         if task.get_type() == TaskType.TILE_UPSCALE:
             controlnet.load_tile_upscaler()

internals/pipelines/replace_background.py

@@ -14,6 +14,7 @@ import internals.util.image as ImageUtil
 from internals.data.result import Result
 from internals.pipelines.commons import AbstractPipeline
 from internals.pipelines.controlnets import ControlNet
+from internals.pipelines.high_res import HighRes
 from internals.pipelines.remove_background import RemoveBackgroundV2
 from internals.pipelines.upscaler import Upscaler
 from internals.util.commons import download_image
@@ -28,6 +29,7 @@ class ReplaceBackground(AbstractPipeline):
         upscaler: Optional[Upscaler] = None,
         remove_background: Optional[RemoveBackgroundV2] = None,
         controlnet: Optional[ControlNet] = None,
+        high_res: Optional[HighRes] = None,
     ):
         if self.__loaded:
             return
@@ -53,9 +55,14 @@ class ReplaceBackground(AbstractPipeline):
         pipe.to("cuda")
 
         self.pipe = pipe
+
+        if not high_res:
+            high_res = HighRes()
+        high_res.load()
+        self.high_res = high_res
+
         if not upscaler:
             upscaler = Upscaler()
-
         upscaler.load()
         self.upscaler = upscaler
 
@@ -72,12 +79,13 @@ class ReplaceBackground(AbstractPipeline):
         width: int,
         height: int,
         product_scale_width: float,
-        prompt: Union[str, List[str]],
-        negative_prompt: Union[str, List[str]],
+        prompt: List[str],
+        negative_prompt: List[str],
         resize_dimension: int,
         conditioning_scale: float,
         seed: int,
         steps: int,
+        apply_high_res: bool = False,
     ):
         if type(image) is str:
             image = download_image(image)
@@ -120,19 +128,44 @@ class ReplaceBackground(AbstractPipeline):
 
         condition_image = ControlNet.linearart_condition_image(image)
 
-        result = self.pipe.__call__(
-            prompt=prompt,
-            negative_prompt=negative_prompt,
-            image=image,
-            mask_image=mask,
-            control_image=condition_image,
-            controlnet_conditioning_scale=conditioning_scale,
-            guidance_scale=9,
-            strength=1,
-            height=height,
-            width=width,
-        )
-        result = Result.from_result(result)
+        if apply_high_res and hasattr(self, "high_res"):
+            (w, h) = self.high_res.get_intermediate_dimension(width, height)
+            images = self.pipe.__call__(
+                prompt=prompt,
+                negative_prompt=negative_prompt,
+                image=image,
+                mask_image=mask,
+                control_image=condition_image,
+                controlnet_conditioning_scale=conditioning_scale,
+                guidance_scale=9,
+                strength=1,
+                num_inference_steps=steps,
+                height=w,
+                width=h,
+            ).images
+            result = self.high_res.apply(
+                prompt=prompt,
+                negative_prompt=negative_prompt,
+                images=images,
+                width=width,
+                height=width,
+                steps=steps,
+            )
+        else:
+            result = self.pipe.__call__(
+                prompt=prompt,
+                negative_prompt=negative_prompt,
+                image=image,
+                mask_image=mask,
+                control_image=condition_image,
+                controlnet_conditioning_scale=conditioning_scale,
+                guidance_scale=9,
+                strength=1,
+                height=height,
+                num_inference_steps=steps,
+                width=width,
+            )
+            result = Result.from_result(result)
 
         images, has_nsfw = result
 

internals/util/slack.py

@@ -22,6 +22,7 @@ class Slack:
         raw.pop("timestamp", None)
         raw.pop("task_id", None)
         raw.pop("maskImageUrl", None)
+        raw.pop("aux_imageUrl", None)
 
         if args is not None:
             raw.update(args.items())