Improve example prompts

DOCS.md

@@ -4,7 +4,7 @@ TL;DR: Enter a prompt or roll the `🎲` and press `Generate`.
 
 ### Prompting
 
-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.
+Positive and negative prompts are embedded by [Compel](https://github.com/damian0815/compel). See [syntax features](https://github.com/damian0815/compel/blob/main/doc/syntax.md) to learn more.
 
 #### Weighting
 
@@ -16,13 +16,13 @@ Groups of tokens can be weighted together by wrapping in parentheses and multipl
 
 Some require specific parameters to get the best results, so check the model's link for more information:
 
-* [Lykon/dreamshaper-8](https://huggingface.co/Lykon/dreamshaper-8)(default)
 * [cyberdelia/CyberRealistic_V5](https://huggingface.co/cyberdelia/CyberRealistic)
 * [fluently/Fluently-v4](https://huggingface.co/fluently/Fluently-v4)
+* [Lykon/dreamshaper-8](https://huggingface.co/Lykon/dreamshaper-8)
 * [s6yx/ReV_Animated](https://huggingface.co/s6yx/ReV_Animated)
 * [SG161222/Realistic_Vision_V5](https://huggingface.co/SG161222/Realistic_Vision_V5.1_noVAE)
 * [stable-diffusion-v1-5/stable-diffusion-v1-5](https://huggingface.co/stable-diffusion-v1-5/stable-diffusion-v1-5)
-* [XpucT/Deliberate_v6](https://huggingface.co/XpucT/Deliberate)
+* [XpucT/Deliberate_v6](https://huggingface.co/XpucT/Deliberate) (default)
 * [XpucT/Reliberate_v3](https://huggingface.co/XpucT/Reliberate)
 
 ### Scale
@@ -55,7 +55,7 @@ For capturing faces, enable `IP-Adapter Face` to use the full-face model. You sh
 
 #### Textual Inversion
 
-Add `<fast_negative>` anywhere in your negative prompt to apply the [`fast_negative`](https://civitai.com/models/71961?modelVersionId=94057) textual inversion embedding. Read [An Image is Worth One Word](https://huggingface.co/papers/2208.01618) to learn more.
+Add `<fast_negative>` anywhere in your negative prompt to apply the [FastNegative v2](https://civitai.com/models/71961?modelVersionId=94057) textual inversion embedding. Read [An Image is Worth One Word](https://huggingface.co/papers/2208.01618) to learn more.
 
 #### DeepCache
 

app.py

@@ -1,6 +1,4 @@
 import argparse
-import json
-import random
 
 import gradio as gr
 
@@ -11,6 +9,7 @@ from lib import (
     download_repo_files,
     generate,
     read_file,
+    read_json,
 )
 
 # Update refresh button hover text
@@ -41,7 +40,6 @@ aspect_ratio_js = """
 }
 """
 
-
 # Show "Custom" aspect ratio when manually changing width or height, or one of the predefined ones
 custom_aspect_ratio_js = """
 (w, h) => {
@@ -54,12 +52,13 @@ custom_aspect_ratio_js = """
 }
 """
 
-
-# Random prompt function
-async def random_fn():
-    prompts = read_file("data/prompts.json")
-    prompts = json.loads(prompts)
-    return gr.Textbox(value=random.choice(prompts))
+random_prompt_js = f"""
+(prompt) => {{
+    const prompts = {read_json("data/prompts.json")};
+    const filtered = prompts.filter(p => p !== prompt);
+    return filtered[Math.floor(Math.random() * filtered.length)];
+}}
+"""
 
 
 # Transform the raw inputs before generation
@@ -356,7 +355,7 @@ with gr.Blocks(
             gr.Markdown(read_file("DOCS.md"))
 
     # Random prompt on click
-    random_btn.click(random_fn, inputs=[], outputs=[prompt], show_api=False)
+    random_btn.click(None, inputs=[prompt], outputs=[prompt], js=random_prompt_js)
 
     # Update seed on click
     refresh_btn.click(None, inputs=[], outputs=[seed], js=refresh_seed_js)

data/prompts.json

@@ -1,48 +1,25 @@
 [
-  "stunning sunset over a futuristic city, with towering skyscrapers, dramatic clouds, golden-hour lighting, atmospheric",
-  "epic dragon perched atop a cliff, detailed claws, fiery landscape, plumes of smoke",
-  "serene beach with crystal clear water and white sand, tropical palm trees swaying in the breeze, paradise",
-  "post-apocalyptic wasteland with rusted and abandoned vehicles, dust storms and towering dust clouds in the distance, dark, gritty, dramatic",
-  "mysterious underwater world with vibrant coral and a school of colorful fish, sun beams shining through the water, magical, enchanting, otherworldly",
-  "snowy winter wonderland with a lone cabin in the distance, surrounded by frosty trees and fresh snowfall, peaceful, serene",
-  "mysterious and abandoned temple in the jungle, surrounded by lush vegetation and tall trees, ancient, atmospheric",
-  "vibrant and bustling city street, busy traffic, bright lights, fast-paced, intense",
-  "gothic cathedral on a stormy night, lightning illuminating the sky, rain pouring down, epic, dramatic, atmospheric",
-  "fantasy castle on a hilltop, surrounded by rolling hills, breathtaking sunset, magical, enchanting, charming, romantic",
-  "vast desert with sand dunes, a lone oasis in the distance, hot sun, blue sky, peaceful, serene",
-  "beautiful waterfall in a lush jungle, sunlight shining through the trees, tropical, peaceful, serene",
-  "enchanted forest with a babbling brook, glowing fireflies, towering trees, shrouded in mist, magical, ethereal, dreamlike, fantasy",
-  "volcanic island with a boiling crater, clouds of ash rise from the peak, intense, dramatic, atmospheric",
-  "lonely lighthouse on a rocky cliff overlooking the sea, stormy sky, crashing waves, ominous, intense, dramatic, atmospheric",
-  "mysterious underground cave with glowing crystals, underground stream, dark, mysterious, otherworldly",
-  "glowing aurora borealis over a frozen lake, with towering mountains in the distance, ethereal, magical, peaceful, serene",
-  "vibrant flower field in the spring, surrounded by rolling hills, brilliant blue sky, full-bloom, colorful, peaceful, serene",
-  "tranquil pond surrounded by tall trees, with a beautiful lily pad garden and calm reflection of the sky, peaceful, serene",
-  "stunning sunset over an ocean horizon, orange and pink hues spread across the sky, peaceful, serene",
-  "abandoned temple in a mountain range, surrounded by misty clouds and tall peaks, mysterious, ancient",
-  "steam locomotive in a snowy mountain range, surrounded by tall peaks, frosted trees, nostalgic",
-  "radiant nebula, star clusters and gas clouds shining brightly, celestial, otherworldly, abstract, space art",
-  "beautiful Santorini island, iconic white buildings, pristine beach, Mediterranean, charming, romantic",
-  "breathtaking Grand Canyon, vast, awe-inspiring, otherworldly, iconic, historic landmark",
-  "breathtaking Machu Picchu, set against a backdrop of towering mountains, iconic, historic landmark",
-  "iconic New York City skyline, with towering skyscrapers, golden-hour lighting, dramatic, atmospheric",
-  "iconic Great Wall of China, stretching along the countryside, historic landmark",
-  "iconic Sydney Opera House, with the harbor and cityscape in the background, stunning, historic landmark",
-  "iconic Taj Mahal, set against a backdrop of lush greenery, stunning, historic landmark",
-  "bowl of steaming hot ramen with a sliced egg, thin slices of meat, green onions, noodles, chopsticks, solo, minimal",
-  "large pizza with melted cheese, seared pepperoni, crispy crust, solo, minimal",
-  "sizzling hot sirloin steak with a perfect crust, seared to perfection, served with a side of roasted vegetables and mashed potatoes, solo, minimal",
-  "wedding cake, white frosting, colorful accent flowers, fresh berry garnish, tiers, layers, elegant, minimal",
-  "baked salmon fillet with a perfectly crispy skin and flaky flesh, side of steamed vegetables and quinoa, healthy, fresh, solo, minimal",
-  "steaming bowl of hearty chili with tender chunks of beef, rich tomato sauce, topped with grated cheddar cheese and green onions, solo, minimal",
-  "platter of sushi rolls, tuna, salmon, california maki, rainbow, colorful, beautiful arrangement, solo, minimal",
-  "stuffed bell pepper filled with browned ground beef, rice, melted cheese, parsley garnish, solo, minimal",
-  "pair of tacos filled with shredded chicken, red onions, cilantro, a drizzle of cream, white plate, blue tablecloth, solo, minimal",
-  "contemporary living room, floor-to-ceiling windows, neutral color palette, minimalistic design, modern furniture, wall-mounted television, ceiling fan, recessed lighting, open floor plan",
-  "rustic kitchen with reclaimed wood cabinetry, large farmhouse sink, industrial lighting fixtures, open shelving, cast iron cookware, exposed brick wall",
-  "luxurious bathroom with freestanding bathtub, marble tiles, brass fixtures, double-sink floating vanity, spa-like atmosphere",
-  "cozy bedroom with a four-poster bed, decorative throw pillows, plush bedding, single large window with natural light, statement wallpaper, relaxing atmosphere",
-  "formula one race car, aerodynamic design, captured in a high speed motion blur, shallow depth-of-field, dramatic lighting, epic, intense",
-  "luxury supercar with aerodynamic curves, high-key lighting, depth-of-field, exotic",
-  "stunning yacht with sleek lines, golden-hour lighting, depth-of-field, breathtaking"
+  "portrait of a blonde woman, detailed facial features, soft natural lighting, bokeh, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "portrait of a young adult woman, freckled complexion, vibrant red hair, smiling, under tree, golden hour lighting, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "portrait of an elderly woman, weathered features, gentle smile, natural window lighting, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "headshot of a middle-aged man, salt and pepper hair, confident expression, studio lighting, neutral backdrop, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+
+  "portrait of a majestic Norwegian forest cat, soft fur detail, green eyes, natural lighting, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "portrait of a British shorthair cat, yellow eyes, gentle expression, soft lighting, bokeh, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "adorable Siamese kitten, blue eyes, soft natural lighting, shallow depth of field, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "portrait of a regal German shepherd, alert ears, noble expression, natural background, golden hour lighting, bokeh, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "Welsh corgi in a colorful garden, cheerful expression, daylight, shallow depth of field, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+
+  "Porsche 911 Turbo (991), front 3/4 view, motion blur, dramatic lighting, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "BMW E92 M3 on mountain road, side profile, motion blur, daylight, professional photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+
+  "tropical beach at sunset, light sand, azure water, swaying palm trees, scattered clouds, distant volcano, ultra wide angle lens, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "lighthouse on rocky coast at dawn, crashing waves, pastel sky, cumulus clouds, soft morning light, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "California vineyard at sunset, rows of grapevines stretching to horizon, golden hour lighting, rolling hills, scattered oak trees, ultra wide angle lens, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "mountain stream in autumn, moss-covered rocks, fallen maple leaves, dappled sunlight through canopy, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "tranquil alpine lake at night, snow-capped mountain range in distance, scattered evergreens along shoreline, aurora borealis in sky, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "desert ranch house at dusk, saguaro cactus, purple mountain backdrop, last rays of sunlight, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "Japanese pagoda between cherry blossom trees, misty mountain backdrop, golden hour lighting, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "red Dutch barn, colorful tulip rows in front, low evening sun, scattered clouds, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd",
+  "lavender field in Provence, ancient stone farmhouse, sunset lighting, scattered clouds, distant mountains, HDR photography, breathtaking, masterpiece, highly detailed, best quality, sharp focus, 8k, uhd"
 ]

lib/__init__.py

@@ -5,6 +5,7 @@ from .utils import (
     disable_progress_bars,
     download_repo_files,
     read_file,
+    read_json,
 )
 
 __all__ = [
@@ -14,4 +15,5 @@ __all__ = [
     "download_repo_files",
     "generate",
     "read_file",
+    "read_json",
 ]

lib/config.py

@@ -86,7 +86,7 @@ Config = SimpleNamespace(
         "controlnet_txt2img": CustomStableDiffusionControlNetPipeline,
         "controlnet_img2img": CustomStableDiffusionControlNetImg2ImgPipeline,
     },
-    MODEL="Lykon/dreamshaper-8",
+    MODEL="XpucT/Deliberate",
     MODELS=[
         "cyberdelia/CyberRealistic",
         "fluently/Fluently-v4",

lib/utils.py

@@ -38,9 +38,10 @@ def timer(message="Operation", logger=print):
 
 
 @functools.lru_cache()
-def load_json(path: str) -> dict:
+def read_json(path: str) -> dict:
     with open(path, "r", encoding="utf-8") as file:
-        return json.load(file)
+        data = json.load(file)
+        return json.dumps(data, indent=4)
 
 
 @functools.lru_cache()