added/updated app files

README.md

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

app.py

@@ -1,45 +0,0 @@
-import gradio as ui; from modules.engine_inpaint import *
-feature = 'Image Inpainting'
-'''
-_____________________________________________________________________
-
-  Copyright © 2023-2024 Ikmal Said. All rights reserved.
-   
-  This program is the property of Ikmal Said. You may not reproduce
-  distribute, or modify this code without the express permission of 
-  the author, Ikmal Said.
-_____________________________________________________________________
-                                                                     
-'''
-with ui.Blocks(css=css, title=title(feature), theme=theme, analytics_enabled=False) as stella:
-    with ui.Tabs() as tabs_inpaint:
-        with ui.TabItem(title(feature), id=0):
-            with ui.Group():
-                input_inpaint = ui.ImageEditor(
-                    show_label=False, transforms=[],
-                    brush=ui.Brush(default_size=24, colors=['#ffffff'], color_mode=['fixed']),
-                    eraser=ui.Eraser(default_size=24), sources=['upload', 'webcam'])
-                
-                prompt_inpaint = ui.Textbox(label="What to include:", show_copy_button=True, placeholder=spholder1)
-                                    
-                with ui.Row():
-                    submit_inpaint = ui.Button("Submit", variant="primary")
-                
-            prompt_example = ui.Examples(label="AI Enhance keywords:", examples=['highly detailed face', 'detailed girl face', 'detailed man face', 'detailed hand', 'detailed leg', 'beautiful eyes'], inputs=[prompt_inpaint])      
-            with ui.Accordion('Advanced', open=False):
-                negative_inpaint = ui.Textbox(label="What not to include:", show_copy_button=True, placeholder=spholder2)
-                number_inpaint = ui.Dropdown(label=snumber, choices=[1,2,3,4], value=4, filterable=False)
-
-        with ui.TabItem('Result', id=1):
-            with ui.Group():
-                output_inpaint = ui.Gallery(preview=True, show_label=False, object_fit="contain", height="43.4vh", show_share_button=False)  
-                
-                with ui.Row():
-                    clear_inpaint = ui.ClearButton(value="Reset", components=[input_inpaint, output_inpaint, prompt_inpaint, negative_inpaint])
-                
-    process_inpaint = submit_inpaint.click(fn=inpaint2, inputs=[input_inpaint, prompt_inpaint, negative_inpaint, number_inpaint], outputs=[tabs_inpaint, input_inpaint, output_inpaint])
-    prompt_inpaint.submit(fn=inpaint2, inputs=[input_inpaint, prompt_inpaint, negative_inpaint, number_inpaint], outputs=[tabs_inpaint, input_inpaint, output_inpaint])
-    clear_inpaint.click(fn=reset, inputs=None, outputs=tabs_inpaint)
-
-if __name__ == "__main__":
-    stella.queue(default_concurrency_limit=100, api_open=True).launch(inbrowser=True, favicon_path="favicon.ico")

app_inpaint.py

@@ -0,0 +1,39 @@
+from modules.engine_inpaint import *
+feature = 'Image Inpainting'
+'''
+_____________________________________________________________________
+
+  Copyright © 2023-2024 Ikmal Said. All rights reserved.
+   
+  This program is the property of Ikmal Said. You may not reproduce
+  distribute, or modify this code without the express permission of 
+  the author, Ikmal Said.
+_____________________________________________________________________
+                                                                     
+'''
+with ui.Blocks(css=adj+css, title=title(feature), theme=theme, analytics_enabled=False, head=jsx) as stella:
+    with ui.Group():
+        input_inpaint = ui.ImageEditor(
+            label=title(feature), transforms=[],
+            brush=ui.Brush(default_size=24, colors=['#ffffff'], color_mode=['fixed']),
+            eraser=ui.Eraser(default_size=24), sources=['upload', 'webcam'])
+        
+        output_inpaint = ui.Gallery(preview=True, show_label=False, object_fit="contain", height="50vh", show_share_button=False, visible=False)  
+        prompt_inpaint = ui.Textbox(label="What to change:", placeholder=spholder1)
+        prompt_example = ui.Examples(label="Enhance keywords:", examples=['highly detailed face', 'detailed girl face', 'detailed man face', 'detailed hand'], inputs=[prompt_inpaint])
+        smart_inpaint = ui.Dropdown(label=ssmart, choices=['Disabled', 'Fusion'], value='Disabled', filterable=False)
+                
+        with ui.Row():
+            clear_inpaint = ui.ClearButton(value="Reset", components=[input_inpaint, output_inpaint, prompt_inpaint])
+            submit_inpaint = ui.Button("Submit", variant="primary")
+            retry_inpaint = ui.Button("Try Again", variant="primary", visible=False)
+
+    process_inpaint = submit_inpaint.click(fn=submit, inputs=[input_inpaint, prompt_inpaint, smart_inpaint], outputs=[input_inpaint, output_inpaint, submit_inpaint, retry_inpaint, output_inpaint])
+    prompt_inpaint.submit(fn=submit, inputs=[input_inpaint, prompt_inpaint, smart_inpaint], outputs=[input_inpaint, output_inpaint, submit_inpaint, retry_inpaint, output_inpaint])
+    clear_inpaint.click(fn=reset, inputs=None, outputs=[input_inpaint, output_inpaint, submit_inpaint, retry_inpaint])
+    retry_inpaint.click(fn=reset, inputs=None, outputs=[input_inpaint, output_inpaint, submit_inpaint, retry_inpaint])
+    
+if __name__ == "__main__":
+    print(css+adj)
+    stella.queue(default_concurrency_limit=100).launch(inbrowser=True, favicon_path="favicon.ico")
+    

modules/engine_inpaint.py

@@ -1,32 +1,24 @@
-import gradio as ui; import requests; from requests.exceptions import Timeout, ConnectionError
+import requests; from requests.exceptions import Timeout, ConnectionError
 from io import BytesIO; from PIL import Image; import concurrent.futures, time
 
-###################################################################################################################
-# Import from modules
-###################################################################################################################
-
 from modules.service_endpoints import *
 from modules.service_configs import *
 
-###################################################################################################################
-# Image inpaint process
-###################################################################################################################
-
-def inpaint(input_image, input_mask, prompt, negative):
+def inpaint(input_image, input_mask, prompt):
     image_pil = Image.fromarray(input_image)
     mask_pil = Image.fromarray(input_mask)
 
     image_bytes = BytesIO()
     mask_bytes = BytesIO()
-    image_pil.save(image_bytes, format='PNG')
-    mask_pil.save(mask_bytes, format='PNG')
+    image_pil.save(image_bytes, format='PNG', optimize=True)
+    mask_pil.save(mask_bytes, format='PNG', optimize=True)
     
     print(f"{receive()} -> {prompt}")
     
     payload = {
         'model_version': (None, '1'),
         'prompt': (None, prompt),
-        'neg_prompt': (None, f"({negative}), hands, face, eyes, legs"),
+        'neg_prompt': (None, "hands, face, eyes, legs"),
         'inpaint_strength': (None, '0.75'),
         'cfg': (None, '9.5'),
         'priority': (None, '1'),
@@ -38,7 +30,7 @@ def inpaint(input_image, input_mask, prompt, negative):
     }
 
     try:
-        response = requests.post(mode['inpaint'], headers=head, data=payload, files=data, timeout=(None, None))
+        response = requests.post(mode['inpaint'], headers=head, data=payload, files=data, timeout=(120, 120))
 
         if len(response.content) < 0 * 1024:
             print(reject())
@@ -56,24 +48,21 @@ def inpaint(input_image, input_mask, prompt, negative):
         ui.Warning(message=single_error)
         return None
 
-###################################################################################################################
-# 4 image for each generation
-###################################################################################################################
-
-def quads_inpaint(a, b, c, d, progress=ui.Progress()):
-    quantities = int(d)
+def quads_inpaint(a, b, c, progress=ui.Progress()):
+    quantities = 2
     result_list = [None] * quantities
     percent = 0
-
+    if c == 'Fusion': b = translate(b)
+    
     with concurrent.futures.ThreadPoolExecutor() as executor:
         futures = []
 
         for i in range(quantities):
-            future = executor.submit(lambda x: inpaint(a["background"], a["layers"][0], b, c), i)
+            future = executor.submit(lambda x: inpaint(a["background"], a["layers"][0], b), 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):
@@ -81,17 +70,12 @@ def quads_inpaint(a, b, c, d, 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)
-
     return successful_results
 
-def inpaint2(a, b, c, d):
-    return ui.Tabs(selected=1), a, quads_inpaint(a, b, c, d)
+def submit(a, b, c):
+    # input, output, submit, try again, inpaint
+    return ui.ImageEditor(visible=False), ui.Gallery(visible=True), ui.Button(visible=False), ui.Button(visible=True), quads_inpaint(a, b, c)
 
 def reset():
-    return ui.Tabs(selected=0)
+    # input, output, submit, try again
+    return ui.ImageEditor(visible=True), ui.Gallery(visible=False), ui.Button(visible=True), ui.Button(visible=False)

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

@@ -1,7 +1,8 @@
 import os
 
 mode = {
-    'inpaint'   : os.getenv('inpaint')
+    'inpaint'   : os.getenv('inpaint'),
+    'fusion'    : os.getenv('fusion')
 }
 
 head = {