Upload folder using huggingface_hub

inference.py

@@ -159,6 +159,7 @@ def tile_upscale(task: Task):
             negative_prompt=task.get_negative_prompt(),
             width=task.get_width(),
             height=task.get_height(),
+            model_id=task.get_model_id(),
         )
 
         lora_patcher.cleanup()
@@ -600,7 +601,7 @@ def load_model_by_task(task: Task):
     else:
         if task.get_type() == TaskType.TILE_UPSCALE:
             if get_is_sdxl():
-                sdxl_tileupscaler.create(text2img_pipe)
+                sdxl_tileupscaler.create(text2img_pipe, task.get_model_id())
             else:
                 controlnet.load_model("tile_upscaler")
         elif task.get_type() == TaskType.CANNY:

internals/pipelines/sdxl_tile_upscale.py

@@ -15,10 +15,15 @@ controlnet = ControlNet()
 
 
 class SDXLTileUpscaler(AbstractPipeline):
-    def create(self, pipeline: Text2Img):
-        controlnet = ControlNetModel.from_pretrained(
-            "thibaud/controlnet-openpose-sdxl-1.0", torch_dtype=torch.float16
+    def create(self, pipeline: Text2Img, model_id: int):
+        # temporal hack for upscale model till multicontrolnet support is added
+        model = (
+            "thibaud/controlnet-openpose-sdxl-1.0"
+            if int(model_id) == 2000293
+            else "diffusers/controlnet-canny-sdxl-1.0"
         )
+
+        controlnet = ControlNetModel.from_pretrained(model, torch_dtype=torch.float16)
         pipe = DemoFusionSDXLControlNetPipeline(
             **pipeline.pipe.components, controlnet=controlnet
         )
@@ -37,12 +42,17 @@ class SDXLTileUpscaler(AbstractPipeline):
         negative_prompt: str,
         width: int,
         height: int,
+        model_id: int,
     ):
-        pose_image = controlnet.detect_pose(imageUrl)
+        if int(model_id) == 2000293:
+            condition_image = controlnet.detect_pose(imageUrl)
+        else:
+            condition_image = download_image(imageUrl)
+            condition_image = ControlNet.canny_detect_edge(condition_image)
         img = download_image(imageUrl).resize((width, height))
 
         img = ImageUtils.resize_image(img, get_base_dimension())
-        pose_image = pose_image.resize(img.size)
+        condition_image = condition_image.resize(img.size)
 
         img2 = self.__resize_for_condition_image(img, resize_dimension)
 
@@ -51,7 +61,7 @@ class SDXLTileUpscaler(AbstractPipeline):
         images = self.pipe.__call__(
             image_lr=image_lr,
             prompt=prompt,
-            condition_image=pose_image,
+            condition_image=condition_image,
             negative_prompt="blurry, ugly, duplicate, poorly drawn, deformed, mosaic",
             guidance_scale=11,
             sigma=0.8,