Added NoobAI model support.

Author: Siberpone

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2024-11-04
+
+* Added support for [NoobAI v1.0](https://civitai.com/models/833294/noobai-xl-nai-xl) model
+
 ### 2024-10-29
 
 **1.1.0** release

README.md

@@ -35,6 +35,7 @@ E621 + [EasyFluff](https://civitai.com/models/129996/easyfluff) samples:
 * One of recommended models (these are the "officially" supported models, but LPP should work well for other tag-based models as long as their "native" booru is used as tag source):
   * [Pony Diffusion V6 XL](https://civitai.com/models/257749?modelVersionId=290640);
   * [Pony Diffusion V5(.5)](https://civitai.com/models/95367/pony-diffusion-v5);
+  * [NoobAI v1.0](https://civitai.com/models/833294/noobai-xl-nai-xl)
   * [EasyFluff](https://civitai.com/models/129996/easyfluff);
   * [SeaArt Furry XL V1](https://civitai.com/models/391781/seaart-furry-xl-10);
   * [AutismMix](https://civitai.com/models/288584);

lpp/data.py

@@ -37,14 +37,16 @@ class Models(enum.Enum):
     EF = "EasyFluff"
     SEAART = "SeaArt Furry v1.0"
     ANIME = "Generic Anime"
+    NOOBAI = "NoobAI XL v1.0"
 
     def get_default_template(model: str) -> str:
         if model == Models.SEAART.value:
             return "{species}, {character}, {artist}, {general}, {meta}"
         if model == Models.ANIME.value:
             return "{character}, {general}, {artist}, {meta}"
-        else:
-            return "{rating}, {character}, {species}, {artist}, {general}, {meta}"
+        if model == Models.NOOBAI.value:
+            return "{character}, {meta}, {artist}, {species}, {general}"
+        return "{rating}, {character}, {species}, {artist}, {general}, {meta}"
 
 
 class Ratings(enum.Enum):

lpp/sources/common.py

@@ -54,9 +54,9 @@ def __init__(self,
 
     def _send_api_request(
         self, endpoint: str, query_params: dict[str:str],
-        user_agent: str = "lazy-pony-prompter (by user Siberpone)/v1.1.1"
+        user_agent: str = "lazy-pony-prompter (by user Siberpone)/v1.1.x"
     ) -> dict[str:object]:
-        TIMEOUTS = (6.1, 9.1)
+        TIMEOUTS = (9.1, 15.1)
         req = requests.get(
             endpoint,
             query_params,

lpp/sources/danbooru.py

@@ -109,3 +109,11 @@ def pdv5_format(self, raw_image_tags: dict[str:list[str]]) -> TagGroups:
             .filter(self.filter)\
             .replace_underscores(exclude=["rating"])\
             .as_tag_groups()
+
+    @formatter(Models.NOOBAI.value)
+    def noobai_fomat(self, raw_image_tags: dict[str:list[str]]) -> TagGroups:
+        return Tags(self._convert_raw_tags(raw_image_tags))\
+            .select("character", "general", "artist", "meta")\
+            .filter(self.filter)\
+            .replace_underscores()\
+            .as_tag_groups()

lpp/sources/e621.py

@@ -122,3 +122,11 @@ def seaart_format(self, raw_image_tags: dict[str:list[str]]) -> TagGroups:
             .select("character", "species", "general", "artist", "meta")\
             .filter(self.filter)\
             .as_tag_groups()
+
+    @formatter(Models.NOOBAI.value)
+    def noobai_fomat(self, raw_image_tags: dict[str:list[str]]) -> TagGroups:
+        return Tags(self._convert_raw_tags(raw_image_tags))\
+            .select("character", "species", "general", "artist", "meta")\
+            .filter(self.filter)\
+            .replace_underscores()\
+            .as_tag_groups()

lpp/ui/a1111.py

@@ -200,7 +200,7 @@ def try_choose_prompts(self,
     def try_export_json(self):
         try:
             payload = {
-                "version": "1.1.1",
+                "version": "1.1.x",
                 "prompts": self.__cache_manager.export_data(),
                 "filters": self.__filters_manager.export_data()
             }

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "lazy-pony-prompter"
 description = "A booru API powered prompt generator for A1111 and ComfyUI with flexible tag filtering system and customizable prompt templates."
-version = "1.1.1"
+version = "1.1.2"
 license = { file = "LICENSE" }
 dependencies = ["tqdm", "requests"]
 

scripts/lpp_extension.py

@@ -649,6 +649,7 @@ def process(self, p, enabled, prompts_format, allowed_ratings,
                 "461c3bbd5c": Models.SEAART.value,  # SeaArt Furry v1.0
                 "821aa5537f": Models.PDV56.value,   # AutismMix_pony
                 "ac006fdd7e": Models.PDV56.value,   # AutismMix_confetti
+                "ff827fc345": Models.NOOBAI.value   # NoobAI XL v1.0
             }
             if p.sd_model_hash not in model_hashes:
                 prompts_format = Models.PDV56.value