Add Anything style

DOCS.md

@@ -51,7 +51,7 @@ Apply up to 2 LoRA (low-rank adaptation) adapters with adjustable strength:
 
 Select one or more [textual inversion](https://huggingface.co/docs/diffusers/en/using-diffusers/textual_inversion_inference) embeddings:
 
-* [`fast_negative`](https://civitai.com/models/71961?modelVersionId=94057): all-purpose (default)
+* [`fast_negative`](https://civitai.com/models/71961?modelVersionId=94057): all-purpose (default, **recommended**)
 * [`cyberrealistic_negative`](https://civitai.com/models/77976?modelVersionId=82745): realistic add-on (for CyberRealistic)
 * [`unrealistic_dream`](https://civitai.com/models/72437?modelVersionId=77173): realistic add-on (for RealisticVision)
 
@@ -63,12 +63,20 @@ Select one or more [textual inversion](https://huggingface.co/docs/diffusers/en/
 
 Start by framing a simple subject like `portrait of a young adult woman` or `landscape of a mountain range` and experiment.
 
+#### Anime
+
+The `Anime: *` styles work the best with Dreamshaper. When using the anime-specific Anything model, you should use the `Anime: Anything` style with the following settings:
+
+* Scheduler: `DEIS 2M` or `DPM++ 2M`
+* Guidance: `10`
+* Steps: `50`
+
+You subject should be a few simple tokens like `girl, brunette, blue eyes, armor, nebula, celestial`. Experiment with `Clip Skip` and `Karras`. Finish with the `Perfection Style` LoRA on a moderate setting and upscale. 
+
 ### Scale
 
 Rescale up to 4x using [Real-ESRGAN](https://github.com/xinntao/Real-ESRGAN) with weights from [ai-forever](ai-forever/Real-ESRGAN). Necessary for high-resolution images.
 
-> NB: I find this Real-ESRGAN model to work well, so I do not use a _hi-res fix_.
-
 ### Image-to-Image
 
 The `🖼️ Image` tab enables the image-to-image and IP-Adapter pipelines. Either use the image input or select a generation from the gallery. To disable, simply clear the image input (the `x` overlay button).

data/styles.json

@@ -1,136 +1,141 @@
 {
   "_base": {
-    "positive": "professional, accurate, precise, highly detailed, best quality, masterpiece",
+    "positive": "good, perfect, accurate, precise, professional, highly detailed, best quality, masterpiece",
     "negative": "watermark, trademark, signature, autograph, artifacts, deformed, mutated, bad, ugly, unattractive, noisy, grainy, blurry, distorted, oversaturated, undersaturated, overexposed, underexposed, amateur, sloppy, cluttered, low detail, worst quality"
   },
   "abstract": {
     "name": "Abstract",
-    "positive": "({prompt}), in an abstract art style, non-representational colors and shapes, expressive, imaginative, vibrant",
-    "negative": "({prompt}), discrete, objective, realism, photographic, monochrome, muted"
+    "positive": "({prompt}), in an abstract art style, non-representational colors and shapes, expressive, imaginative, vibrant, {_base}",
+    "negative": "({prompt}), discrete, objective, realism, photographic, monochrome, muted, {_base}"
   },
-  "anime_shonen": {
-    "name": "Anime: Shonen",
-    "positive": "({prompt}), in a shonen anime style, One Piece, by Eiichiro Oda, manga, action, adventure, heroic, youthful, vibrant, high contrast",
-    "negative": "({prompt}), shojo, seinen, josei, chibi, kawaii, realism, photographic, dull, plain, monochrome, muted, low contrast"
+  "anime_anything": {
+    "name": "Anime: Anything",
+    "positive": "({prompt}), masterpiece, best quality, illustration, beautiful detailed, finely detailed, dramatic light, intricate details",
+    "negative": "({prompt}), lowres, bad anatomy, bad hands, text, error, missing fingers, extra digit, fewer digits, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry"
   },
-  "anime_shojo": {
-    "name": "Anime: Shojo",
-    "positive": "({prompt}), in a shojo anime style, Sailor Moon, by Naoko Takeuchi, manga, kawaii, romantic, emotional, pastel colors, soft lines",
-    "negative": "({prompt}), shonen, seinen, josei, dark, gritty, realism, photographic"
+  "anime_josei": {
+    "name": "Anime: Josei",
+    "positive": "({prompt}), in a josei anime style, Paradise Kiss, by Ai Yazawa, manga, mature, emotional, sophisticated, soft colors, refined lines, {_base}",
+    "negative": "({prompt}), shonen, shojo, seinen, chibi, dark, gritty, realism, photographic, {_base}"
   },
   "anime_seinen": {
     "name": "Anime: Seinen",
-    "positive": "({prompt}), in a seinen anime style, Ghost in the Shell, by Masamune Shirow, manga, adult, mature, dark, gritty, intricate design, dramatic lighting, high contrast",
-    "negative": "({prompt}), shonen, shojo, josei, chibi, kawaii, realism, photographic, dull, plain, low contrast"
+    "positive": "({prompt}), in a seinen anime style, Ghost in the Shell, by Masamune Shirow, manga, adult, mature, dark, gritty, intricate design, dramatic lighting, high contrast, {_base}",
+    "negative": "({prompt}), shonen, shojo, josei, chibi, kawaii, realism, photographic, dull, plain, low contrast, {_base}"
   },
-  "anime_josei": {
-    "name": "Anime: Josei",
-    "positive": "({prompt}), in a josei anime style, Paradise Kiss, by Ai Yazawa, manga, mature, emotional, sophisticated, soft colors, refined lines",
-    "negative": "({prompt}), shonen, shojo, seinen, chibi, dark, gritty, realism, photographic"
+  "anime_shojo": {
+    "name": "Anime: Shojo",
+    "positive": "({prompt}), in a shojo anime style, Sailor Moon, by Naoko Takeuchi, manga, kawaii, romantic, emotional, pastel colors, soft lines, {_base}",
+    "negative": "({prompt}), shonen, seinen, josei, dark, gritty, realism, photographic, {_base}"
+  },
+  "anime_shonen": {
+    "name": "Anime: Shonen",
+    "positive": "({prompt}), in a shonen anime style, One Piece, by Eiichiro Oda, manga, action, adventure, heroic, youthful, vibrant, high contrast, {_base}",
+    "negative": "({prompt}), shojo, seinen, josei, chibi, kawaii, realism, photographic, dull, plain, monochrome, muted, low contrast, {_base}"
   },
   "art_deco": {
     "name": "Art Deco",
-    "positive": "({prompt}), in an art deco style, inspired by Tamara de Lempicka, geometric shapes, bold colors, luxurious, elegant, sleek, streamlined, symmetrical, vibrant, high contrast",
-    "negative": "({prompt}), realism, photographic, asymmetrical, monochrome, muted, low contrast"
+    "positive": "({prompt}), in an art deco style, inspired by Tamara de Lempicka, geometric shapes, bold colors, luxurious, elegant, sleek, streamlined, symmetrical, vibrant, high contrast, {_base}",
+    "negative": "({prompt}), realism, photographic, asymmetrical, monochrome, muted, low contrast, {_base}"
   },
   "biomechanical": {
     "name": "Biomechanical",
-    "positive": "({prompt}), in a biomechanical style, organic and mechanical, flesh and metal, cyborg, cybernetic, intricate design, futuristic, sci-fi",
-    "negative": "({prompt}), natural, rustic, primitive, medieval"
+    "positive": "({prompt}), in a biomechanical style, organic and mechanical, flesh and metal, cyborg, cybernetic, intricate design, futuristic, sci-fi, {_base}",
+    "negative": "({prompt}), natural, rustic, primitive, medieval, {_base}"
   },
   "cubism": {
     "name": "Cubism",
-    "positive": "({prompt}), in a cubist style, inspired by Picasso, fragmented shapes and planes, abstract forms, collage",
-    "negative": "({prompt}), discrete, objective"
+    "positive": "({prompt}), in a cubist style, inspired by Picasso, fragmented shapes and planes, abstract forms, collage, {_base}",
+    "negative": "({prompt}), discrete, objective, {_base}"
   },
   "cyberpunk": {
     "name": "Cyberpunk",
-    "positive": "({prompt}), in a cyberpunk style, 2077, synthwave, neon, digital, high-tech, futuristic, dystopian, vibrant, high contrast",
-    "negative": "({prompt}), rustic, primitive, medieval, monochrome, muted, low contrast"
+    "positive": "({prompt}), in a cyberpunk style, 2077, synthwave, neon, digital, high-tech, futuristic, dystopian, vibrant, high contrast, {_base}",
+    "negative": "({prompt}), rustic, primitive, medieval, monochrome, muted, low contrast, {_base}"
   },
   "enhance": {
     "name": "Enhance",
-    "positive": "({prompt})",
-    "negative": "({prompt})"
+    "positive": "({prompt}), {_base}",
+    "negative": "({prompt}), {_base}"
   },
   "expressionism": {
     "name": "Expressionism",
-    "positive": "({prompt}), in an expressionist style, energetic brushwork, bold colors, abstract forms, vibrant, expressive, imaginative, high contrast",
-    "negative": "({prompt}), discrete, objective, realism, photographic, dull, plain, monochrome, muted, low contrast"
+    "positive": "({prompt}), in an expressionist style, energetic brushwork, bold colors, abstract forms, vibrant, expressive, imaginative, high contrast, {_base}",
+    "negative": "({prompt}), discrete, objective, realism, photographic, dull, plain, monochrome, muted, low contrast, {_base}"
   },
   "fantasy": {
     "name": "Fantasy",
-    "positive": "({prompt}), in a fantasy style, digital concept art, by Greg Rutkowski, trending on ArtStation, magical, enchanting, ethereal, dreamlike, graphic, illustration, high contrast",
-    "negative": "({prompt}), realism, photographic, ordinary, mundane, monochrome, muted, low contrast"
+    "positive": "({prompt}), in a fantasy style, digital concept art, by Greg Rutkowski, trending on ArtStation, magical, enchanting, ethereal, dreamlike, graphic, illustration, high contrast, {_base}",
+    "negative": "({prompt}), realism, photographic, ordinary, mundane, monochrome, muted, low contrast, {_base}"
   },
   "graffiti": {
     "name": "Graffiti",
-    "positive": "({prompt}), in a graffiti style, street art, creative composition, dynamic lines, spray paint, hip-hop, stylized, bold, vibrant, urban, mural, high contrast",
-    "negative": "({prompt}), dull, plain, monochrome, muted, low contrast"
+    "positive": "({prompt}), in a graffiti style, street art, creative composition, dynamic lines, spray paint, hip-hop, stylized, bold, vibrant, urban, mural, high contrast, {_base}",
+    "negative": "({prompt}), dull, plain, monochrome, muted, low contrast, {_base}"
   },
   "line_art": {
     "name": "Line Art",
-    "positive": "({prompt}), in a line art drawing style, graphic, illustration, sleek, streamlined, centered composition, solo subject, isolated subject, white background, minimalist arrangement",
-    "negative": "({prompt}), off-center, oil, acrylic, watercolor"
+    "positive": "({prompt}), in a line art drawing style, graphic, illustration, sleek, streamlined, centered composition, solo subject, isolated subject, white background, minimalist arrangement, {_base}",
+    "negative": "({prompt}), off-center, oil, acrylic, watercolor, {_base}"
   },
   "papercraft": {
     "name": "Papercraft",
-    "positive": "({prompt}), as a papercraft model, Kirigami style, folded paper, papercut, sharp edges, intricate design, 3d, layered, textural, color block, centered composition, minimalist arrangement",
-    "negative": "({prompt}), 2d, flat"
+    "positive": "({prompt}), as a papercraft model, Kirigami style, folded paper, papercut, sharp edges, intricate design, 3d, layered, textural, color block, centered composition, minimalist arrangement, {_base}",
+    "negative": "({prompt}), 2d, flat, {_base}"
   },
   "photography_food": {
     "name": "Photography: Food",
-    "positive": "({prompt}), food photography style, fresh ingredients, delicious, culinary, real, authentic, macro details, soft natural lighting, high resolution, uhd, centered composition, minimalist arrangement",
-    "negative": "({prompt}), unappetizing, fake, artificial, low resolution"
+    "positive": "({prompt}), food photography style, fresh ingredients, delicious, culinary, real, authentic, macro details, soft natural lighting, high resolution, uhd, centered composition, minimalist arrangement, {_base}",
+    "negative": "({prompt}), unappetizing, fake, artificial, low resolution, {_base}"
   },
   "photography_hdr": {
     "name": "Photography: HDR",
-    "positive": "({prompt}), breathtaking HDR photography, high dynamic range, vivid colors, shadows and highlights, dramatic lighting, high contrast, high resolution, uhd",
-    "negative": "({prompt}), flat colors, plain, dull, low dynamic range, low contrast, low resolution"
+    "positive": "({prompt}), breathtaking HDR photography, high dynamic range, vivid colors, shadows and highlights, dramatic lighting, high contrast, high resolution, uhd, {_base}",
+    "negative": "({prompt}), flat colors, plain, dull, low dynamic range, low contrast, low resolution, {_base}"
   },
   "photography_iphone": {
     "name": "Photography: iPhone",
-    "positive": "({prompt}), taken by iPhone ProRAW camera, XDR, Retina, depth-of-field, vivid colors, dynamic range, dramatic lighting, real, authentic, high contrast, high resolution, uhd",
-    "negative": "({prompt}), shallow depth-of-field, bokeh, fake, artificial, low contrast, low resolution"
+    "positive": "({prompt}), taken by iPhone ProRAW camera, XDR, Retina, depth-of-field, vivid colors, dynamic range, dramatic lighting, real, authentic, high contrast, high resolution, uhd, {_base}",
+    "negative": "({prompt}), shallow depth-of-field, bokeh, fake, artificial, low contrast, low resolution, {_base}"
   },
   "photography_iphone_portrait": {
     "name": "Photography: iPhone Portrait",
-    "positive": "({prompt}), taken by iPhone Portrait Mode, XDR, Retina, shallow depth-of-field, bokeh, vivid colors, dramatic lighting, real, authentic, high contrast, high resolution, uhd",
-    "negative": "({prompt}), fake, artificial, low contrast, low resolution"
+    "positive": "({prompt}), taken by iPhone Portrait Mode, XDR, Retina, shallow depth-of-field, bokeh, vivid colors, dramatic lighting, real, authentic, high contrast, high resolution, uhd, {_base}",
+    "negative": "({prompt}), fake, artificial, low contrast, low resolution, {_base}"
   },
   "photography_real_estate": {
     "name": "Photography: Real Estate",
-    "positive": "({prompt}), real estate photography style, on Zillow, inviting, staged, well-lit, real, authentic, high resolution, uhd",
-    "negative": "({prompt}), dark, fake, artificial, low resolution"
+    "positive": "({prompt}), real estate photography style, on Zillow, inviting, staged, well-lit, real, authentic, high resolution, uhd, {_base}",
+    "negative": "({prompt}), dark, fake, artificial, low resolution, {_base}"
   },
   "photography_street": {
     "name": "Photography: Street",
-    "positive": "({prompt}), street photography style, taken on Fujifilm X100V, f2 aperture, 35mm, RAW format, candid, authentic, gritty, urban, high contrast, high resolution, uhd",
-    "negative": "({prompt}), staged, fake, artificial, low contrast, low resolution"
+    "positive": "({prompt}), street photography style, taken on Fujifilm X100V, f2 aperture, 35mm, RAW format, candid, authentic, gritty, urban, high contrast, high resolution, uhd, {_base}",
+    "negative": "({prompt}), staged, fake, artificial, low contrast, low resolution, {_base}"
   },
   "pointillism": {
     "name": "Pointillism",
-    "positive": "({prompt}), pointillism style, composed of small dots, inspired by Georges Seurat, intricate design, vibrant",
-    "negative": "({prompt}), line drawing, smooth shading, wide color gamut, dull, plain, monochrome, muted"
+    "positive": "({prompt}), pointillism style, composed of small dots, inspired by Georges Seurat, intricate design, vibrant, {_base}",
+    "negative": "({prompt}), line drawing, smooth shading, wide color gamut, dull, plain, monochrome, muted, {_base}"
   },
   "pop_art": {
     "name": "Pop Art",
-    "positive": "({prompt}), in a pop art style, inspired by Warhol, bright colors, bold outlines, popular culture, kitsch, vibrant, high contrast",
-    "negative": "({prompt}), discrete, objective, dull, plain, monochrome, muted, low contrast"
+    "positive": "({prompt}), in a pop art style, inspired by Warhol, bright colors, bold outlines, popular culture, kitsch, vibrant, high contrast, {_base}",
+    "negative": "({prompt}), discrete, objective, dull, plain, monochrome, muted, low contrast, {_base}"
   },
   "render": {
     "name": "Render",
-    "positive": "({prompt}), Octane render, Unreal Engine, volumetric lighting, ray tracing, ambient occlusion, subsurface scattering, high resolution, uhd",
-    "negative": "({prompt}), glitch, error, painting, sketch, low resolution"
+    "positive": "({prompt}), Octane render, Unreal Engine, volumetric lighting, ray tracing, ambient occlusion, subsurface scattering, high resolution, uhd, {_base}",
+    "negative": "({prompt}), glitch, error, painting, sketch, low resolution, {_base}"
   },
   "vaporwave": {
     "name": "Vaporwave",
-    "positive": "({prompt}), in a vaporwave style, retro aesthetic, neon colors, vibrant, high contrast",
-    "negative": "({prompt}), dark, monochrome, muted, low contrast"
+    "positive": "({prompt}), in a vaporwave style, retro aesthetic, neon colors, vibrant, high contrast, {_base}",
+    "negative": "({prompt}), dark, monochrome, muted, low contrast, {_base}"
   },
   "watercolor": {
     "name": "Watercolor",
-    "positive": "({prompt}), painted with watercolors, colorful, painterly, artistic, fluid",
-    "negative": "({prompt}), realism, photographic, oil, acrylic, digital"
+    "positive": "({prompt}), painted with watercolors, colorful, painterly, artistic, fluid, {_base}",
+    "negative": "({prompt}), realism, photographic, oil, acrylic, digital, {_base}"
   }
 }

lib/inference.py

@@ -51,8 +51,12 @@ def apply_style(positive_prompt, negative_prompt, style_id="none"):
 
     style_base = styles.get("_base", {})
     return (
-        f"{style.get('positive')}, {style_base.get('positive')}".format(prompt=positive_prompt),
-        f"{style.get('negative')}, {style_base.get('negative')}".format(prompt=negative_prompt),
+        style.get("positive")
+        .format(prompt=positive_prompt, _base=style_base.get("positive"))
+        .strip(),
+        style.get("negative")
+        .format(prompt=negative_prompt, _base=style_base.get("negative"))
+        .strip(),
     )