Update app.py

app.py

@@ -132,7 +132,7 @@ def imgur(prompt, img, seed):
     return link, loglink
     
 sdtries = 0
-def sd(prompt, negprompt):
+def sd(prompt, negprompt, version):
     if prompt == "":
         return Image.open('error.png'), "Error! Please enter a prompt"
 
@@ -151,16 +151,22 @@ def sd(prompt, negprompt):
         # convert the sdkey from bytes to a string
         sdkey = sdkey.decode()
 
+    if version == "2.1":
+        engine = "stable-diffusion-512-v2-1"
+    if version == "1.5":
+        engine = "stable-diffusion-v1-5"
+
     # connect to dream API
     stability_api = client.StabilityInference(
         key = sdkey,
         verbose=True,
-        engine="stable-diffusion-512-v2-1",
+        engine=engine,
     )
     # convert string prompt to lowercase
     prompt = prompt.lower()
     negprompt = negprompt.lower()
 
+    print(version)
     # set random seed
     seed = random.randint(0, 9999999)
 
@@ -192,10 +198,13 @@ def sd(prompt, negprompt):
                 answers = stability_api.generate(
                     #prompt=prompt,
                     steps=15,
+                    sampler=generation.SAMPLER_K_DPMPP_2S_ANCESTRAL,
+                    guidance_preset=generation.GUIDANCE_PRESET_FAST_GREEN,
                     seed=seed,
                     prompt = [generation.Prompt(text=prompt,parameters=generation.PromptParameters(weight=5)), 
                     generation.Prompt(text=negprompt,parameters=generation.PromptParameters(weight=-5))],
                     )
+        
 
                 # convert seed to string
                 seed = str(seed)
@@ -233,26 +242,32 @@ def sd(prompt, negprompt):
     
 
 
-examples = [["A hyperrealistic photograph of German architectural modern home in the suburbs of Hamburg, Germany, lens flares, cinematic, hdri, matte painting, concept art, celestial, soft render, highly detailed, cgsociety, octane render, trending on artstation, architectural HD, HQ, 4k, 8k", "tree, bush, woods, branches, leaves, green, forest"],
-["A Hyperrealistic photograph of ancient Malaysian architectural ruins in Borneo's East Malaysia, lens flares, cinematic, hdri, matte painting, concept art, celestial, soft render, highly detailed, cgsociety, octane render, trending on artstation, architectural HD, HQ, 4k, 8k", ""],
-["A valley in the Alps at sunset, epic vista, beautiful landscape, 4k, 8k", ""],
-["A Hyperrealistic photograph of ancient Tokyo/London/Paris architectural ruins in a flooded apocalypse landscape of dead skyscrapers, lens flares, cinematic, hdri, matte painting, concept art, celestial, soft render, highly detailed, cgsociety, octane render, trending on artstation, architectural HD, HQ, 4k, 8k", ""],
-["a portrait of a beautiful blonde woman, fine - art photography, soft portrait shot 8 k, mid length, ultrarealistic uhd faces, unsplash, kodak ultra max 800, 85 mm, intricate, casual pose, centered symmetrical composition, stunning photos, masterpiece, grainy, centered composition", "blender, cropped, lowres, poorly drawn face, out of frame, poorly drawn hands, blurry, bad art, blurred, text, watermark, disfigured, deformed, closed eyes"],
-["A hyperrealistic painting of an astronaut inside of a massive futuristic metal mechawarehouse, cinematic, sci-fi, lens flares, rays of light, epic, matte painting, concept art, celestial, soft render, octane render, trending on artstation, 4k, 8k", "blender, cropped, lowres, out of frame, blurry, bad art, blurred, text, disfigured, deformed"]]
+examples = [["A hyperrealistic photograph of German architectural modern home in the suburbs of Hamburg, Germany, lens flares, cinematic, hdri, matte painting, concept art, celestial, soft render, highly detailed, cgsociety, octane render, trending on artstation, architectural HD, HQ, 4k, 8k", "tree, bush, woods, branches, leaves, green, forest", "2.1"],
+["A dream of a distant galaxy, by Caspar David Friedrich, matte painting trending on artstation HQ", "", "1.5"],
+["A Hyperrealistic photograph of ancient Malaysian architectural ruins in Borneo's East Malaysia, lens flares, cinematic, hdri, matte painting, concept art, celestial, soft render, highly detailed, cgsociety, octane render, trending on artstation, architectural HD, HQ, 4k, 8k", "", "2.1"],
+["A dream of a distant galaxy, by Caspar David Friedrich, matte painting trending on artstation HQ", "", "1.5"],
+["A small cabin on top of a snowy mountain in the style of Disney, artstation", "", "2.1"],
+["A Hyperrealistic photograph of ancient Tokyo/London/Paris architectural ruins in a flooded apocalypse landscape of dead skyscrapers, lens flares, cinematic, hdri, matte painting, concept art, celestial, soft render, highly detailed, cgsociety, octane render, trending on artstation, architectural HD, HQ, 4k, 8k", "", "2.1"],
+["a portrait of a beautiful blonde woman, fine - art photography, soft portrait shot 8 k, mid length, ultrarealistic uhd faces, unsplash, kodak ultra max 800, 85 mm, intricate, casual pose, centered symmetrical composition, stunning photos, masterpiece, grainy, centered composition", "blender, cropped, lowres, poorly drawn face, out of frame, poorly drawn hands, blurry, bad art, blurred, text, watermark, disfigured, deformed, closed eyes", "2.1"],
+["A hyperrealistic painting of an astronaut inside of a massive futuristic metal mechawarehouse, cinematic, sci-fi, lens flares, rays of light, epic, matte painting, concept art, celestial, soft render, octane render, trending on artstation, 4k, 8k", "blender, cropped, lowres, out of frame, blurry, bad art, blurred, text, disfigured, deformed", "2.1"]]
 
-with gr.Blocks(css = """
-*, body, #name, #negprompt, #ex, #article, .border-gray-200, .gr-input, .border-gray-100 { background: #0b0f19; color: white; border-color: #4c4c4c; } 
-.gr-samples-gallery .gr-sample-textbox, #greet_btn, #save_btn, .py-1, .gr-samples-gallery:hover .gr-sample-textbox:hover, .gr-text-input, #output, .wrap.svelte-1c38quw, .h-wrap { background: #1f2937; color: white; border-color: #4c4c4c;}
-.py-6 {padding-top: 0;}
-"""
+with gr.Blocks(
 ) as demo:
+    # create radio for to use either v1.5 or v2.0
+    version = gr.Radio(
+        label="Stable Diffusion Version",
+        choices=["1.5", "2.1"],
+        value="1.5",
+        elem_id="version",
+    )
+    
     download = gr.HTML(elem_id="download")
     output = gr.Image(label="Image Generation", elem_id="output")
     name = gr.Textbox(label="Prompt", placeholder="Describe the image you want to generate. Longer and more detailed prompts work better.", elem_id="name") 
     negprompt = gr.Textbox(label="Negative Prompt", placeholder="Describe the image you want to avoid. Longer and more detailed prompts work better.", elem_id="negprompt")
     greet_btn = gr.Button("Generate Image", elem_id="greet_btn")
     bin = gr.HTML("", visible=False)
-    ex = gr.Examples(examples=examples, fn=sd, inputs=[name, negprompt], outputs=[output, download], cache_examples=True)
+    ex = gr.Examples(examples=examples, fn=sd, inputs=[name, negprompt, version], outputs=[output, download], cache_examples=False)
     greet_btn.click(
             None,
             [],
@@ -268,7 +283,7 @@ with gr.Blocks(css = """
                 Cookies.set('creations', parseInt(Cookies.get('creations')) + 1, { expires: 250 / 24 / 60 / 60 }); }
                 console.log(Cookies.get('creations'));
             }""")
-    greet_btn.click(fn=sd, inputs=[name, negprompt], outputs=[output, download])
+    greet_btn.click(fn=sd, inputs=[name, negprompt, version], outputs=[output, download])
 
 
 demo.queue(concurrency_count=3, max_size=20).launch(max_threads=150)