Remove styles

DOCS.md

@@ -6,19 +6,12 @@ TL;DR: Enter a prompt or roll the `🎲` and press `Generate`.
 
 Positive and negative prompts are embedded by [Compel](https://github.com/damian0815/compel) for weighting. See [syntax features](https://github.com/damian0815/compel/blob/main/doc/syntax.md) to learn more.
 
+#### Weighting
+
 Use `+` or `-` to increase the weight of a token. The weight grows exponentially when chained. For example, `blue+` means 1.1x more attention is given to `blue`, while `blue++` means 1.1^2 more, and so on. The same applies to `-`.
 
 Groups of tokens can be weighted together by wrapping in parentheses and multiplying by a float between 0 and 2. For example, `(masterpiece, best quality)1.2` will increase the weight of both `masterpiece` and `best quality` by 1.2x.
 
-This is the same syntax used in [InvokeAI](https://invoke-ai.github.io/InvokeAI/features/PROMPTS/) and it differs from [A1111](https://github.com/AUTOMATIC1111/stable-diffusion-webui):
-
-| Compel      | A1111         |
-| ----------- | ------------- |
-| `blue++`    | `((blue))`    |
-| `blue--`    | `[[blue]]`    |
-| `(blue)1.2` | `(blue:1.2)`  |
-| `(blue)0.8` | `(blue:0.8)`  |
-
 ### Models
 
 Some require specific parameters to get the best results, so check the model's link for more information:
@@ -32,12 +25,6 @@ Some require specific parameters to get the best results, so check the model's l
 * [XpucT/Deliberate_v6](https://huggingface.co/XpucT/Deliberate)
 * [XpucT/Reliberate_v3](https://huggingface.co/XpucT/Reliberate)
 
-### Styles
-
-[Styles](https://huggingface.co/spaces/adamelliotfields/diffusion/blob/main/data/styles.json) are prompt templates that wrap your positive and negative prompts. Inspired by [twri/sdxl_prompt_styler](https://github.com/twri/sdxl_prompt_styler).
-
-> 💡 When using syles, start with a simple prompt like `portrait of a cat` or `landscape of a mountain range`.
-
 ### 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.

README.md

@@ -62,8 +62,7 @@ preload_from_hub:  # up to 10
 Gradio app for Stable Diffusion 1.5 featuring:
 * txt2img and img2img pipelines with IP-Adapter
 * ControlNet with Canny edge detection (more preprocessors coming soon)
-* Compel prompt weighting
-* Hand-written style templates
+* Compel prompt weighting and blending
 * Multiple samplers with Karras scheduling
 * DeepCache available
 * Real-ESRGAN upscaling

app.py

@@ -184,19 +184,9 @@ with gr.Blocks(
             with gr.Row():
                 negative_prompt = gr.Textbox(
                     label="Negative Prompt",
-                    value="nsfw+",
-                    min_width=320,
+                    value="nsfw",
                     lines=1,
                 )
-                styles = json.loads(read_file("data/styles.json"))
-                style_ids = list(styles.keys())
-                style_ids = [sid for sid in style_ids if not sid.startswith("_")]
-                style = gr.Dropdown(
-                    min_width=320,
-                    value=Config.STYLE,
-                    label="Style Template",
-                    choices=[("None", "none")] + [(styles[sid]["name"], sid) for sid in style_ids],
-                )
 
             # Model settings
             gr.HTML("<h3>Model</h3>")
@@ -430,7 +420,6 @@ with gr.Blocks(
             image_prompt,
             control_image_prompt,
             ip_image_prompt,
-            style,
             seed,
             model,
             scheduler,

data/styles.json

@@ -1,141 +0,0 @@
-{
-  "_base": {
-    "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, {_base}",
-    "negative": "({prompt}), discrete, objective, realism, photographic, monochrome, muted, {_base}"
-  },
-  "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_josei": {
-    "name": "Anime: Josei",
-    "positive": "({prompt}), in a josei anime style, inspired by Paradise Kiss, by Ai Yazawa, manga, mature, emotional, sophisticated, soft colors, refined lines, {_base}",
-    "negative": "({prompt}), shonen, shoujo, seinen, dark, gritty, realism, photographic, {_base}"
-  },
-  "anime_seinen": {
-    "name": "Anime: Seinen",
-    "positive": "({prompt}), in a seinen anime style, inspired by Ghost in the Shell, by Masamune Shirow, manga, adult, mature, dark, gritty, intricate design, dramatic lighting, high contrast, {_base}",
-    "negative": "({prompt}), shonen, shoujo, josei, realism, photographic, dull, plain, low contrast, {_base}"
-  },
-  "anime_shojo": {
-    "name": "Anime: Shoujo",
-    "positive": "({prompt}), in a shoujo anime style, manga, 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, manga, action, adventure, heroic, youthful, vibrant, high contrast, {_base}",
-    "negative": "({prompt}), shoujo, seinen, josei, 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, {_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, {_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, {_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, {_base}",
-    "negative": "({prompt}), rustic, primitive, medieval, monochrome, muted, low contrast, {_base}"
-  },
-  "enhance": {
-    "name": "Enhance",
-    "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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_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, {_base}",
-    "negative": "({prompt}), dark, monochrome, muted, low contrast, {_base}"
-  },
-  "watercolor": {
-    "name": "Watercolor",
-    "positive": "({prompt}), painted with watercolors, colorful, painterly, artistic, fluid, {_base}",
-    "negative": "({prompt}), realism, photographic, oil, acrylic, digital, {_base}"
-  }
-}

lib/config.py

@@ -122,7 +122,6 @@ Config = SimpleNamespace(
         "canny": "lllyasviel/control_v11p_sd15_canny",
     },
     NEGATIVE_EMBEDDING="fast_negative",
-    STYLE="enhance",
     WIDTH=512,
     HEIGHT=512,
     NUM_IMAGES=1,

lib/inference.py

@@ -14,34 +14,12 @@ from .logger import Logger
 from .utils import (
     annotate_image,
     clear_cuda_cache,
-    load_json,
     resize_image,
     safe_progress,
     timer,
 )
 
 
-# Inject prompts into style templates
-def apply_style(positive_prompt, negative_prompt, style_id="none"):
-    if style_id.lower() == "none":
-        return (positive_prompt, negative_prompt)
-
-    styles = load_json("./data/styles.json")
-    style = styles.get(style_id)
-    if style is None:
-        return (positive_prompt, negative_prompt)
-
-    style_base = styles.get("_base", {})
-    return (
-        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(),
-    )
-
-
 # Dynamic signature for the GPU duration function
 def gpu_duration(**kwargs):
     loading = 20
@@ -66,7 +44,6 @@ def generate(
     image_prompt=None,
     control_image_prompt=None,
     ip_image_prompt=None,
-    style=None,
     seed=None,
     model="Lykon/dreamshaper-8",
     scheduler="DDIM",
@@ -88,7 +65,7 @@ def generate(
 ):
     start = time.perf_counter()
     log = Logger("generate")
-    log.info(f"Generating {num_images} image{'s' if num_images > 1 else ''}")
+    log.info(f"Generating {num_images} image{'s' if num_images > 1 else ''}...")
 
     if Config.ZERO_GPU:
         safe_progress(progress, 100, 100, "ZeroGPU init")
@@ -178,17 +155,12 @@ def generate(
     for i in range(num_images):
         try:
             generator = torch.Generator(device=pipe.device).manual_seed(current_seed)
-            positive_styled, negative_styled = apply_style(positive_prompt, negative_prompt, style)
-
-            # User didn't provide a negative prompt
-            if negative_styled.startswith("(), "):
-                negative_styled = negative_styled[4:]
 
             if negative_embedding:
-                negative_styled += f", <{Config.NEGATIVE_EMBEDDING}>"
+                negative_prompt += f", <{Config.NEGATIVE_EMBEDDING}>"
 
             positive_embeds, negative_embeds = compel.pad_conditioning_tensors_to_same_length(
-                [compel(positive_styled), compel(negative_styled)]
+                [compel(positive_prompt), compel(negative_prompt)]
             )
         except PromptParser.ParsingException:
             raise Error("Invalid prompt")