added/updated app files

README.md

@@ -5,7 +5,7 @@ colorFrom: pink
 colorTo: purple
 sdk: gradio
 sdk_version: 4.20.1
-app_file: app.py
+app_file: app_v2.py
 pinned: false
 license: agpl-3.0
 ---

app.py → app_v2.py

@@ -1,4 +1,4 @@
-import gradio as ui; from modules.engine_v2 import *
+from modules.engine_v2 import *
 feature = 'Text-to-Image - V2 / V3'
 '''
 _____________________________________________________________________
@@ -11,23 +11,27 @@ _____________________________________________________________________
 _____________________________________________________________________
                                                                      
 '''
-with ui.Blocks(css=css, title=title(feature), theme=theme, analytics_enabled=False) as stella:
+with ui.Blocks(css=css, title=title(feature), theme=theme, analytics_enabled=False, head=jsx) as stella:
     with ui.Group():  
-        result_v2 = ui.Gallery(label=title(feature), object_fit="contain", height="43.4vh", show_share_button=False)  
-        prompt_v2 = ui.Textbox(show_label=False, show_copy_button=True, placeholder=spholder)
+        result_v2 = ui.Gallery(label=title(feature), object_fit="contain", height="98vh", show_share_button=False)  
+        prompt_v2 = ui.Textbox(label=sprompt, placeholder=spholder)
         with ui.Row():
             clear_v2 = ui.ClearButton(value="Reset", components=[result_v2, prompt_v2])
             submit_v2= ui.Button("Submit", variant="primary")
                 
-        with ui.Accordion('Advanced', open=False):
+        with ui.Accordion('More options'):        
             style_v2 = ui.Dropdown(label=sstyle, choices=list(stella_v2.keys()), value='None', filterable=False)
-            model_v2 = ui.Dropdown(label=smodel, choices=list(ckpt_v2.keys()), value='Toon V2', filterable=False)
+            model_v2 = ui.Dropdown(label=smodel, choices=list(ckpt_v2.keys()), value='Creative V3', filterable=False)
             ratio_v2 = ui.Dropdown(label=sratio, choices=list(ratio.keys()), value='Square (1:1)', filterable=False)
             quality_v2 = ui.Dropdown(label=squality, choices=quality, value='Enhanced', filterable=False)
-            number_v2 = ui.Dropdown(label=snumber, choices=[1,2,3,4], value=4, filterable=False)
+            smart_v2 = ui.Dropdown(label=ssmart, choices=smart, value='Disabled', filterable=False)
+            with ui.Row():
+                seedtype_v2 = ui.Dropdown(label='Seed type:', choices=['Randomized', 'Fixed'], value='Randomized', filterable=False)
+                seedno_v2 = ui.Number(label='Seed value:', value=0, minimum=0, maximum=max_seed, visible=False)
 
-    process_v2 = submit_v2.click(fn=quads_v2, inputs=[prompt_v2, model_v2, style_v2, ratio_v2, quality_v2, number_v2], outputs=[result_v2])
-    prompt_v2.submit(fn=quads_v2, inputs=[prompt_v2, model_v2, style_v2, ratio_v2, quality_v2, number_v2], outputs=[result_v2])
+    process_v2 = submit_v2.click(fn=quads_v2, inputs=[prompt_v2, model_v2, style_v2, ratio_v2, quality_v2, smart_v2, seedtype_v2, seedno_v2], outputs=[result_v2, result_v2])
+    prompt_v2.submit(fn=quads_v2, inputs=[prompt_v2, model_v2, style_v2, ratio_v2, quality_v2, smart_v2, seedtype_v2, seedno_v2], outputs=[result_v2, result_v2])
+    seedtype_v2.select(fn=seeds, inputs=seedtype_v2, outputs=seedno_v2)
 
 if __name__ == "__main__":
-    stella.queue(default_concurrency_limit=100, api_open=True).launch(inbrowser=True, favicon_path="favicon.ico")
+    stella.queue(default_concurrency_limit=100).launch(inbrowser=True, favicon_path="favicon.ico")

modules/engine_upscale_alt.py

@@ -1,17 +1,9 @@
-import gradio as ui; import requests; from requests.exceptions import Timeout
+import requests; from requests.exceptions import Timeout
 from io import BytesIO; from PIL import Image
 
-###################################################################################################################
-# Import from modules
-###################################################################################################################
-
 from modules.service_endpoints import *
 from modules.service_configs import *
 
-###################################################################################################################
-# Image upscale process
-###################################################################################################################
-
 def upscale(upscale_input, progress=ui.Progress()):
     image_bytes = BytesIO()
     upscale_input.save(image_bytes, format='JPEG')
@@ -20,8 +12,8 @@ def upscale(upscale_input, progress=ui.Progress()):
     payload = {'model_version': (None, '1')}; data = [('image',('upscale_input.jpg', image_bytes.getvalue(), 'image/jpeg'))]
 
     try:
-        progress(0.99, desc="Upscaling image...")
-        response = requests.post(mode['upscale'], headers=head, data=payload, files=data, timeout=30)
+        progress(0.95, desc="Upscaling image...")
+        response = requests.post(mode['upscale'], headers=head, data=payload, files=data, timeout=(60, 60))
                 
         if len(response.content) < 65 * 1024:
             print(reject())

modules/engine_v2.py

@@ -1,40 +1,36 @@
-import gradio as ui; import requests; from requests.exceptions import Timeout
+import requests; from requests.exceptions import Timeout
 from io import BytesIO; from PIL import Image, ImageEnhance; import concurrent.futures, time
 
-###################################################################################################################
-# Import from modules
-###################################################################################################################
-
 from modules.service_endpoints import *
 from modules.input_configs import *
 from modules.styles_v2 import *
 from modules.models_v2 import *
 from modules.service_configs import *
 from modules.engine_upscale_alt import *
+from gradio_client import Client
 
-###################################################################################################################
-# Image generation process
-###################################################################################################################
-
-def gen_v2(prompt, model, style, size, quality):
+def gen_v2(prompt, model, style, size, quality, seed_type, seed_num):
     prompt = stella_v2[style]['prompt'].format(prompt=prompt)
-    negative_v2 = stella_v2[style]['negative_prompt']
+    # negative_v2 = stella_v2[style]['negative_prompt']
+    if seed_type == 'Randomized': seed_number = random.randint(0, max_seed)
+    else: seed_number = seed_num
     
     print(f"{receive()} -> {prompt}")
-    
+
     data = {
         'model_version': (None, '1'),
         'prompt': (None, prompt),
         'style_id': (None, ckpt_v2[str(model)]),
-        'negative_prompt': (None, negative_v2),
+        'negative_prompt': (None, 'hands, face, eyes, legs'),
         'aspect_ratio': (None, ratio[str(size)]),
         'high_res_results': (None, '1'),
         'cfg': (None, '9.5'),
         'priority': (None, '1'),
+        'seed': (None, str(seed_number))
     }
     
     try:
-        response = requests.post(mode['generate'], headers=head, files=data, timeout=30)
+        response = requests.post(mode['generate'], headers=head, files=data, timeout=(60, 60))
         
         if len(response.content) < 65 * 1024:
             print(reject())
@@ -67,7 +63,12 @@ def gen_v2(prompt, model, style, size, quality):
                     ).enhance(1.05)
                 ).enhance(1.05)
             return upscale(better2)
-       
+        
+        if quality == 'Upscaled':
+            print("better3 -> upscaled output")
+            better3 = Image.open(BytesIO(response.content))
+            return upscale(better3)
+        
         else:
             print("original -> raw output")
             original = Image.open(BytesIO(response.content))
@@ -82,24 +83,28 @@ def gen_v2(prompt, model, style, size, quality):
         ui.Warning(message=single_error)
         return None
 
-###################################################################################################################
-# 4 image for each generation
-###################################################################################################################
-
-def quads_v2(a, b, c, d, e, f, progress=ui.Progress()):
-    quantities = int(f)
+def quads_v2(a, b, c, d, e, f, g, h,  progress=ui.Progress()):
+    if g == 'Randomized': quantities = 2
+    else: quantities = 1
+    
+    if b == 'Lightning': quantities = 1
+    
     result_list = [None] * quantities
     percent = 0
-
+    
+    if f == 'Fusion': a = translate(a)
+    if f == 'Expansion': a = expand(a)
+    if f == 'Fusion and Expansion': a = expand(translate(a))
+    
     with concurrent.futures.ThreadPoolExecutor() as executor:
         futures = []
 
         for i in range(quantities):
-            future = executor.submit(lambda x: gen_v2(a, b, c, d, e), i)
+            future = executor.submit(lambda x: gen_v2(a, b, c, d, e, g, h), i)
             futures.append(future)
-            multiplier = 0.99 / quantities
+            multiplier = 0.95 / quantities
             percent += multiplier
-            progress(percent, desc=f"Processing image {i + 1} of {quantities}")
+            progress(percent, desc=f"Generating results")
             time.sleep(0.25)
 
     for i, future in enumerate(futures):
@@ -107,13 +112,6 @@ def quads_v2(a, b, c, d, e, f, progress=ui.Progress()):
         result_list[i] = result
 
     successful_results = [result for result in result_list if result is not None]
-
-    if len(successful_results) < quantities:
-        if quantities == 1:
-            ui.Warning(message=single_error)
-        else:
-            ui.Warning(message=quads_error)
-    else:
-        pass
-
-    return successful_results
+    
+    if g == 'Randomized': return successful_results, ui.Gallery(columns=1, rows=2)
+    else: return successful_results, ui.Gallery(columns=1, rows=1)

modules/input_configs.py

@@ -14,35 +14,13 @@ ratio = {
 quality = [
     'Original',
     'Enhanced',
+    'Upscaled',
     'Enhanced and Upscaled'
 ]
 
-negative_list = [
-    'hands',
-    'nsfw',
-    'naked',
-    'jpeg',
-    'ugly',
-    'tiling',
-    'poorly drawn hands',
-    'poorly drawn feet',
-    'poorly drawn face',
-    'out of frame',
-    'extra limbs',
-    'disfigured',
-    'deformed',
-    'body out of frame',
-    'bad anatomy',
-    'watermark',
-    'signature',
-    'cut off',
-    'low contrast',
-    'underexposed',
-    'overexposed',
-    'bad art',
-    'beginner',
-    'amateur',
-    'distorted face'
-]
-
-negative_v1 = ', '.join(negative_list)
+smart = [
+    'Disabled',
+    'Fusion',
+    'Expansion',
+    'Fusion and Expansion'
+]

modules/models_v2.py

@@ -1,10 +1,12 @@
 ckpt_v2 = {
+    'Lightning': '',
     'Anime V2': '34',
     'Toon V2': '36',
     'Realistic V2': '124',
-    'Creative V2a': '33',
-    'Creative V2b': '35',
+    'Creative V2-a': '33',
+    'Creative V2-b': '35',
     'Toon V3': '39',
+    'Creative V3': '126',
     'Realistic V3': '12000',
-    'SDXL': '122',
+    'SDXL': '122'
 }

modules/service_configs.py

@@ -1,53 +1,23 @@
-import gradio as ui; from datetime import datetime; import logging
+import gradio as ui; from datetime import datetime; import logging, requests, json, random
+from modules.service_endpoints import *; import numpy as np
 
 # enable debug
 logging.basicConfig(level=logging.DEBUG)
 
 # global theme
 theme = ui.themes.Default(
-    font=[ui.themes.GoogleFont('Roboto Condensed'), 'Arial'],
-    text_size=ui.themes.Size(lg="16px", md="16px", sm="16px", xl="16px", xs="16px", xxl="16px", xxs="16px"),
+    font=[ui.themes.GoogleFont('IBM Plex Sans Condensed')], font_mono=[ui.themes.GoogleFont('IBM Plex Sans Condensed')],
+    text_size=ui.themes.Size(lg="18px", md="18px", sm="18px", xl="18px", xs="18px", xxl="18px", xxs="18px"),
     primary_hue='rose', secondary_hue='rose', neutral_hue='zinc', radius_size=ui.themes.sizes.radius_none)
 
-css = '''
-footer {
-    display: none !important;
-}
-
-div.svelte-vt1mxs>*, div.svelte-vt1mxs>.form > * {
-    border: none;
-}
-
-.app.svelte-182fdeq.svelte-182fdeq {
-    padding: 0px !important;
-}
-
-.grid-wrap.svelte-hpz95u.svelte-hpz95u {
-    overflow-y: auto !important;
-}
-
-.selected.svelte-1uw5tnk {
-    background: #262629 !important;
-}
-
-.closed.svelte-g7pfx4>button.svelte-g7pfx4 {
-    display: none !important;
-}
-
-gradio-app {
-    background: none !important;
-}
-
-input.svelte-1f354aw.svelte-1f354aw, textarea.svelte-1f354aw.svelte-1f354aw {
-    text-align: justify !important;
-}
-'''
-
 # global locale - english
 success         = 'That worked successfully!'
 single_error    = 'That did not work!'
 quads_error     = 'Some images cannot be processed!'
 empty_error     = 'Prompt field cannot be empty!'
+pf_error        = 'Prompt fusion error. Proceeding...'
+pe_error        = 'Prompt expansion error. Proceeding...'
+pe_cmd          = '(The prompt must intricately describe every part of the image in concrete, objective detail. THINK about what the end goal of the description is, and extrapolate that to what would make satisfying images.)'
 received        = 'Request Received'
 timed           = 'Request Timeout'
 rejected        = 'Request Error/Rejected'
@@ -60,12 +30,14 @@ spholder2       = 'Things to get rid of!'
 spholder3       = 'Put wonders into the generated prompt!'
 sprompt         = 'Generate images of:'
 sprompt1        = 'Based on image, create:'
+sprompt2        = 'Based on image, it shows:'
 smodel          = 'Using the AI model:'
 smode           = 'Using the mode:'
 sratio          = 'In the size of:'
 sstyle          = 'Inspired by the style of:'
 squality        = 'At a quality level of:'
 snumber         = 'With a quantity of:'
+ssmart          = 'Using SmartPrompt™ mode:'
 
 # global function
 def timestamp():        return f"[{datetime.now().strftime('%d/%m/%y at %H:%M:%S')}]"
@@ -75,4 +47,235 @@ def reject():           return f"{timestamp()} \U0000274C {rejected}"
 def done():             return f"{timestamp()} \U0001F618 {complete}"
 def header(feature):    ui.HTML(f'<center><h4 style="font-size: 1em; margin: 5px 0px 5px">{feature}</h4></center>')
 def footer():           ui.HTML(f'<center><h4 style="font-size: 1em; margin: 5px 0px 0px">{liability}<br></h4>{rights}</center>')
-def title(feature):     return f"{feature}"
+def title(feature):     return f"{feature}"
+
+# seed generator
+max_seed = np.iinfo(np.int32).max
+
+def seeds(a, i: ui.SelectData):
+    print(f"Seed mode: {a}")
+    if i.value == 'Fixed': return ui.Slider(value=random.randint(0, max_seed), visible=True)
+    else: return ui.Slider(visible=False)
+    
+# prompt fusion to en
+def translate(fusion, progress=ui.Progress()):
+    progress(0.05, desc="Initiating fusion")
+    try: print(f"{receive()} -> {fusion}"); return requests.get(f"{mode['fusion']}{fusion}", timeout=15).json()[0][0]
+    except Exception as e: print(pf_error, e); return fusion
+
+# prompt expander
+def expand(expand, progress=ui.Progress()):
+    progress(0.10, desc="Initiating expansion")
+    # return str(input)
+    head = {'Content-Type': 'application/json'}
+    body = json.dumps({"sentence": f"{expand} {pe_cmd}", "target_word_count": 30})
+    # body = json.dumps({"topic": input, "word_count": 30, "writing_mode": "Simple", "story_genre": "Descriptive"}) # ['story']
+    try: print(f"{receive()} -> {expand}"); return requests.post(url=mode['expander'], headers=head, data=body, timeout=15).json()['expanded_sentence']
+    except Exception as e: print(pe_error, e); return expand
+
+# global head script
+jsx = '''
+<script>
+    window.onbeforeunload = function (event) {
+        event.returnValue = "Are you sure you want to leave?";
+    };
+</script>
+'''
+
+# specific css modifiers
+adj = '''
+/* remove layers button */
+.layer-wrap.svelte-g7pfx4.svelte-g7pfx4 {
+    display: none !important;
+}
+'''
+
+adj2 = '''
+.grid-wrap.svelte-hpz95u.svelte-hpz95u {
+    height: 49.8vh;
+}
+'''
+
+# global css modifiers
+css = '''
+/* remove scrollbars */
+::-webkit-scrollbar {
+  display: none;
+}
+
+::-webkit-scrollbar-button {
+  display: none;
+}
+
+body {
+  -ms-overflow-style: none;
+}
+
+/* remove footer */
+footer {
+    display: none !important;
+}
+
+/* remove all padding */
+.app.svelte-182fdeq.svelte-182fdeq {
+    padding: 0px;
+}
+
+/* remove scroll bar in gallery */
+.grid-wrap.svelte-hpz95u.svelte-hpz95u {
+    overflow-y: auto;
+}
+
+/* remove background */
+gradio-app {
+    background: none !important;
+}
+
+/* remove borders for tabs*/
+div.svelte-iyf88w {
+    border: 0px;
+}
+
+/* remove padding for tabs */
+div.svelte-19hvt5v {
+    padding: 0px;
+    border: 0px;
+}
+
+/* remove borders for tab button bottom*/
+.tab-nav.svelte-1uw5tnk {
+    border: 0px;
+}
+
+/* remove borders for tab button*/
+button.svelte-1uw5tnk {
+    border: 0px;
+}
+
+/* modify container padding and bg */
+.hide-container.svelte-90oupt {
+    padding: var(--block-padding);
+    background: var(--block-background-fill);
+}
+
+/* set brush to red */
+span.svelte-btgkrd {
+    background: rgb(255 0 0 / 60%);
+}
+
+/* remove example symbol */
+svg.svelte-13hsdno.svelte-13hsdno.svelte-13hsdno {
+    display: none;
+}
+
+/* replace selected tab color */
+.selected.svelte-1uw5tnk {
+    background: #27272a;
+}
+
+/* justify textbox */
+input.svelte-1f354aw.svelte-1f354aw,
+textarea.svelte-1f354aw.svelte-1f354aw {
+    text-align: justify;
+}
+
+/* modify feature text */
+label.float.svelte-1b6s6s {
+    padding-left: 10px;
+    padding-top: 6px;
+}
+
+/* change feature background */
+label.svelte-1b6s6s {
+    background: #27272a;
+}
+
+/* remove feature icon */
+span.svelte-1b6s6s {
+    display: none;
+}
+
+/* remove options line */
+div.svelte-sfqy0y {
+    background: none;
+}
+
+/* modify layer button */
+.layer-wrap.svelte-g7pfx4.svelte-g7pfx4 {
+    background: #27272a;
+}
+
+/* modify slider color */
+.dark, .light {
+    --slider-color: var(--color-accent);
+}
+
+/* chanhe num input padding and height */
+input[type="number"].svelte-pjtc3.svelte-pjtc3 {
+    padding: var(--checkbox-label-padding);
+    height: 45px;
+}
+
+/* disable anti-aliasing on gallery thumb */
+.thumbnail-lg.svelte-hpz95u>img {
+    image-rendering: auto;
+}
+
+/* disable anti-aliasing on gallery view */
+.image-button.svelte-hpz95u img {
+    image-rendering: auto;
+}
+
+/* make gallery buttons bigger */
+.icon-buttons.svelte-hpz95u.svelte-hpz95u {
+    scale: 2;
+    padding-top: 8px;
+    padding-right: 15px;
+}
+
+/* make img clear btn bigger */
+div.svelte-s6ybro {
+    scale: 2;
+    padding-right: 5px;
+    padding-top: 5px;
+}
+
+/* make img dload btn bigger */
+.icon-buttons.svelte-1l6wqyv {
+    top: 8px;
+    right: 8px;
+    scale: 2;
+    padding-right: 5px;
+    padding-top: 5px;
+}
+
+/* remove bg completely */
+body {
+   background: none !important;
+}
+
+/* wide mode */
+.app.svelte-182fdeq.svelte-182fdeq {
+    max-width: 100% !important;
+}
+
+/* make prompt consistant */
+label.svelte-1f354aw.svelte-1f354aw {
+    padding: 12px;
+}
+
+/* remove accord label */
+.label-wrap.open.svelte-s1r2yt {
+    display: none;
+}
+
+/* make empty gallery taller */
+.unpadded_box.svelte-1oiin9d {
+    min-height: 50vh;
+}
+
+/* make image contain */
+.image-frame.svelte-rrgd5g img {
+    object-fit: contain;
+}
+'''

modules/service_endpoints.py

@@ -2,7 +2,9 @@ import os
 
 mode = {
     'generate'  : os.getenv('generate'),
-    'upscale'   : os.getenv('upscale')
+    'upscale'   : os.getenv('upscale'),
+    'fusion'    : os.getenv('fusion'),
+    'expander'  : os.getenv('expander')
 }
 
 head = {