Upload folder using huggingface_hub

inference.py

@@ -12,14 +12,21 @@ from internals.pipelines.inpainter import InPainter
 from internals.pipelines.pose_detector import PoseDetector
 from internals.pipelines.prompt_modifier import PromptModifier
 from internals.pipelines.safety_checker import SafetyChecker
+from internals.util.anomaly import remove_colors
 from internals.util.args import apply_style_args
 from internals.util.avatar import Avatar
-from internals.util.cache import (auto_clear_cuda_and_gc, clear_cuda,
-                                  clear_cuda_and_gc)
-from internals.util.commons import (download_image, pickPoses, upload_image,
-                                    upload_images)
-from internals.util.config import (num_return_sequences, set_configs_from_task,
-                                   set_root_dir)
+from internals.util.cache import auto_clear_cuda_and_gc, clear_cuda, clear_cuda_and_gc
+from internals.util.commons import (
+    download_image,
+    pickPoses,
+    upload_image,
+    upload_images,
+)
+from internals.util.config import (
+    num_return_sequences,
+    set_configs_from_task,
+    set_root_dir,
+)
 from internals.util.failure_hander import FailureHandler
 from internals.util.lora_style import LoraStyle
 from internals.util.slack import Slack
@@ -123,6 +130,14 @@ def get_patched_prompt_tile_upscale(task: Task):
     else:
         prompt = img2text.process(task.get_imageUrl())
 
+    # merge blip
+    if task.PROMPT.has_placeholder_blip_merge():
+        blip = img2text.process(task.get_imageUrl())
+        prompt = task.PROMPT.merge_blip(blip)
+
+    # remove anomalies in prompt
+    prompt = remove_colors(prompt)
+
     prompt = avatar.add_code_names(prompt)
     prompt = lora_style.prepend_style_to_prompt(prompt, task.get_style())
 

internals/data/task.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from functools import lru_cache
 from typing import Union
 
 import numpy as np
@@ -144,3 +145,18 @@ class Task:
 
     def get_raw(self) -> dict:
         return self.__data.copy()
+
+    @property
+    @lru_cache(1)
+    def PROMPT(self):
+        class PromptMethods:
+            def __init__(self, task: Task):
+                self.__task = task
+
+            def has_placeholder_blip_merge(self) -> bool:
+                return "<blip:[merge]>" in self.__task.get_prompt()
+
+            def merge_blip(self, text: str) -> str:
+                return self.__task.get_prompt().replace("<blip:[merge]>", text)
+
+        return PromptMethods(self)

internals/util/anomaly.py

@@ -0,0 +1,60 @@
+import re
+
+__colors = [
+    "Amber",
+    "Aqua",
+    "Azure",
+    "Beige",
+    "Black",
+    "Blue",
+    "Bronze",
+    "Brown",
+    "Chartreuse",
+    "Clay",
+    "Clay",
+    "Cyan",
+    "Dark",
+    "Gainsboro",
+    "Golden",
+    "Grape",
+    "Green",
+    "Grey",
+    "Indigo",
+    "Ivory",
+    "Light",
+    "Lime",
+    "Magenta",
+    "Maroon",
+    "Metallic",
+    "Mint",
+    "Mistry",
+    "Mustard",
+    "Navy",
+    "Neon",
+    "Off",
+    "Olive",
+    "Orange",
+    "Orange",
+    "Pea",
+    "Peru",
+    "Pink",
+    "Plum",
+    "Purple",
+    "Red",
+    "Ruby",
+    "Rust",
+    "Silver",
+    "Snow",
+    "Teal",
+    "Turquoise",
+    "Violet",
+    "Wheat",
+    "White",
+    "Yellow",
+]
+
+
+def remove_colors(text: str) -> str:
+    for color in __colors:
+        text = re.sub(color, "", text, flags=re.I)
+    return text