Merge pull request #193 from banodoco/staging

Staging

Author: piyushK52

.gitignore

@@ -33,4 +33,5 @@ images.zip
 depth.png
 masked_image.png
 concatenated.mp4
-temp.png
+temp.png
+scripts/app_checkpoint.json

app.py

@@ -7,7 +7,7 @@
 from shared.constants import HOSTED_BACKGROUND_RUNNER_MODE, OFFLINE_MODE, SERVER, ServerType
 import sentry_sdk
 from shared.logging.logging import AppLogger
-from utils.app_update_utils import check_for_updates
+from utils.app_update_utils import apply_updates, check_and_pull_changes, load_save_checkpoint
 from utils.common_utils import is_process_active
 
 from utils.constants import AUTH_TOKEN, RUNNER_PROCESS_NAME, RUNNER_PROCESS_PORT
@@ -91,7 +91,10 @@ def main():
         # if it's the first time,
         if "first_load" not in st.session_state:
             if not is_process_active(RUNNER_PROCESS_NAME, RUNNER_PROCESS_PORT):
-                check_for_updates()  # enabling auto updates only for local version
+                if not load_save_checkpoint():
+                    check_and_pull_changes()  # enabling auto updates only for local version
+                else:
+                    apply_updates()
             st.session_state["first_load"] = True
         start_runner()
         project_init()

django_settings.py

@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 import sys
+from django.db.backends.signals import connection_created
 
 sys.path.append("../")
 
@@ -19,13 +20,19 @@
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
+def set_sqlite_timeout(sender, connection, **kwargs):
+    if connection.vendor == 'sqlite':
+        cursor = connection.cursor()
+        cursor.execute('PRAGMA busy_timeout = 30000;')  # 30 seconds
+
 if HOSTED_BACKGROUND_RUNNER_MODE in [False, "False"]:
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.sqlite3",     # sqlite by default works with serializable isolation level
             "NAME": DB_LOCATION,
         }
     }
+    connection_created.connect(set_sqlite_timeout)
 else:
     import boto3
 

readme.md

@@ -154,18 +154,8 @@ cd Dough
 ---
 
 ### Using personal ComfyUI instance
-You can provide the path to your ComfyUI instance and Dough will use the models present there. Add the following at the bottom of the ".env" file
-```bash
-COMFY_MODELS_BASE_PATH="full_path_to_your_ComfyUI"
-```
-for e.g. in the case of Linux users this may look something like this
-
-```bash
-COMFY_MODELS_BASE_PATH="/home/ubuntu/my_apps/ComfyUI/"
-```
+You can provide the path to your ComfyUI instance in the "App Settings" section of Dough
 
-It will also download the new models in your personal ComfyUI instance. Please note that Dough
-will maintain it's own copy of the nodes and packages to not cause any issues with the packages that might already be installed on your personal ComfyUI.
 
 If you're having any issues, please share them in our [Discord](https://discord.com/invite/8Wx9dFu5tP).
 

scripts/app_version.txt

@@ -1 +1 @@
-0.9.8
+0.9.8

ui_components/components/app_settings_page.py

@@ -101,17 +101,26 @@ def app_settings_page():
 def custom_comfy_input_component():
     custom_comfy_key = "COMFY_MODELS_BASE_PATH"
     custom_comfy_path = load_from_env(custom_comfy_key)
+
     if not custom_comfy_path:
         st.info(
             """
-            Please enter your custom ComfyUI path below. Dough will use the models present in your personal ComfyUI
+            Please enter the FULL path to your custom ComfyUI below. Dough will use the models present in your personal ComfyUI
             for inference. It will also download the new models in your personal ComfyUI instance. Please note that 
             Dough will maintain it's own copy of the nodes and packages to not cause any issues with the packages 
             that might already be installed on your personal ComfyUI.
             
             """
         )
-    h1, _ = st.columns([1, 1])
+
+    h1, h2 = st.columns([1, 1])
+    with h2:
+        st.info(
+            """
+            IMPORTANT: After updating the path, please stop the app and restart for the changes to take place
+            """
+        )
+
     with h1:
         updated_path = st.text_input(
             "Custom ComfyUI path:",

ui_components/components/explorer_page.py

@@ -966,9 +966,11 @@ def gallery_image_view(project_uuid, shortlist=False, view=["main"], shot=None,
 
             st.markdown("***")
     else:
-        if st.session_state["page"] == "Shots":
+        if shortlist:
+            st.info("No images present. You can add images to the shortlist in the 'Inspiration Engine' tab.")
+        else:             
             st.info(
-                "No images present. You can generate images by clicking into the 'Inspiration Engine' tab on the left."
+                "No images present. You can generate images by clicking in the 'Inspiration Engine' section."
             )
-        else:
-            st.info("No images present. You can generate images above.")
+            
+            

ui_components/components/inspiraton_engine_page.py

@@ -31,6 +31,8 @@ def inspiration_engine_page(shot_uuid: str, h2):
             with st.expander("🔍 Generation log", expanded=True):
                 sidebar_logger(st.session_state["shot_uuid"])
 
+
+
             st.write("")
             with st.expander("🪄 Shots", expanded=True):
                 timeline_view(shot_uuid, "🪄 Shots", view="sidebar")

ui_components/components/timeline_view_page.py

@@ -6,6 +6,7 @@
 from utils import st_memory
 from utils.data_repo.data_repo import DataRepo
 from ui_components.widgets.sidebar_logger import sidebar_logger
+from ui_components.components.explorer_page import gallery_image_view
 
 
 def timeline_view_page(shot_uuid: str, h2):
@@ -28,6 +29,17 @@ def timeline_view_page(shot_uuid: str, h2):
             with st.expander("🔍 Generation log", expanded=True):
                 # if st_memory.toggle("Open", value=True, key="generaton_log_toggle"):
                 sidebar_logger(st.session_state["shot_uuid"])
+            
+            st.write("")
+
+            with st.expander("📋 Shortlist", expanded=True):
+                if st_memory.toggle("Open", value=True, key="explorer_shortlist_toggle"):
+                    gallery_image_view(
+                        shot.project.uuid,
+                        shortlist=True,
+                        view=["add_and_remove_from_shortlist", "add_to_any_shot"],
+                    )
+                
 
 
 

ui_components/widgets/inspiration_engine.py

@@ -25,6 +25,7 @@
 # NOTE: since running locally is very slow (comfy startup, models loading, other gens in process..)
 # rn we are accessing the replicate API directly, will switch to some other local method in the future
 
+
 def check_replicate_key():
     data_repo = DataRepo()
     app_secrets = data_repo.get_app_secrets_from_user_uuid()
@@ -41,7 +42,7 @@ def check_replicate_key():
 
 def edit_prompts(edit_text, list_of_prompts):
     # Convert list of prompts to a single string separated by '|'
-    prompts_string = '|'.join(list_of_prompts)
+    prompts_string = "|".join(list_of_prompts)
 
     query_data = {
         "top_p": 0.9,
@@ -54,23 +55,23 @@ def edit_prompts(edit_text, list_of_prompts):
         "presence_penalty": 1.15,
         "stop_sequences": " ",
     }
-    
+
     output = replicate.run(
         "meta/meta-llama-3-8b",
         input=query_data,
     )
 
     proper_output = ""  # Initialize an empty string to accumulate outputs
     for item in output:
-        if isinstance(item, dict) and 'output' in item:
-            proper_output += item['output']  # Concatenate each output to the proper_output string
+        if isinstance(item, dict) and "output" in item:
+            proper_output += item["output"]  # Concatenate each output to the proper_output string
         else:
             proper_output += str(item)  # Handle cases where item is not a dictionary
-    
+
     list_of_prompts = proper_output.strip()
-    list_of_prompts = list_of_prompts.lstrip('\n')
+    list_of_prompts = list_of_prompts.lstrip("\n")
     # Proper output should be only before the first \n
-    list_of_prompts = list_of_prompts.split("\n")[0]     
+    list_of_prompts = list_of_prompts.split("\n")[0]
 
     return list_of_prompts
 
@@ -100,14 +101,14 @@ def generate_prompts(
 
     proper_output = ""  # Initialize an empty string to accumulate outputs
     for item in output:
-        if isinstance(item, dict) and 'output' in item:
-            proper_output += item['output']  # Concatenate each output to the proper_output string
+        if isinstance(item, dict) and "output" in item:
+            proper_output += item["output"]  # Concatenate each output to the proper_output string
         else:
             proper_output += str(item)  # Handle cases where item is not a dictionary
     list_of_prompts = proper_output.strip()
-    list_of_prompts = list_of_prompts.lstrip('\n')
+    list_of_prompts = list_of_prompts.lstrip("\n")
     # Proper output should be only before the first \n
-    list_of_prompts = proper_output.split("\n")[0]     
+    list_of_prompts = proper_output.split("\n")[0]
     return list_of_prompts
 
 
@@ -132,8 +133,8 @@ def inspiration_engine_element(project_uuid, position="explorer", shot_uuid=None
     style_reference_list = [
         {
             "name": "The Strangest Dream",
-            "images": [                
-                "https://banodoco.s3.amazonaws.com/plan/strangest_dream_2.png",                
+            "images": [
+                "https://banodoco-data-bucket-public.s3.ap-south-1.amazonaws.com/general_pics/strangest_dream_2.png",
             ],
             "description": "Bold, dark colors, Dark Blue & red dominant, dream like, surreal.",
             "models_works_best_with": "Dreamshaper, Deliberate",
@@ -144,7 +145,7 @@ def inspiration_engine_element(project_uuid, position="explorer", shot_uuid=None
         {
             "name": "Green Hard Funk",
             "images": [
-                "https://banodoco.s3.amazonaws.com/plan/green_hard_funk_1.png",                                
+                "https://banodoco-data-bucket-public.s3.ap-south-1.amazonaws.com/general_pics/green_hard_funk_1.png",
             ],
             "description": "Dominant green tones, red accents, high contrast, geometrical lining.",
             "models_works_best_with": "Dreamshaper, Deliberate",
@@ -155,7 +156,7 @@ def inspiration_engine_element(project_uuid, position="explorer", shot_uuid=None
         {
             "name": "Nordic Pale Blue",
             "images": [
-                "https://banodoco.s3.amazonaws.com/plan/nordic_pale_blue_1.png",                                
+                "https://banodoco-data-bucket-public.s3.ap-south-1.amazonaws.com/general_pics/nordic_pale_blue_1.png",
             ],
             "description": "Pale blue, grey, pastel colors, ornamental and decorative details.",
             "models_works_best_with": "Dreamshaper, Deliberate",
@@ -166,7 +167,7 @@ def inspiration_engine_element(project_uuid, position="explorer", shot_uuid=None
         {
             "name": "Insane Animane",
             "images": [
-                "https://banodoco.s3.amazonaws.com/plan/insane_animane_1.png",                                
+                "https://banodoco-data-bucket-public.s3.ap-south-1.amazonaws.com/general_pics/insane_animane_1.png",
             ],
             "description": "Detailed animation style, Blue, orange, white dominant, intense, expressive",
             "models_works_best_with": "Dreamshaper, Deliberate",
@@ -176,8 +177,8 @@ def inspiration_engine_element(project_uuid, position="explorer", shot_uuid=None
         },
         {
             "name": "Delicate Pink Glimmer",
-            "images": [                
-                "https://banodoco.s3.amazonaws.com/plan/delicate_pink_2.png",                
+            "images": [
+                "https://banodoco-data-bucket-public.s3.ap-south-1.amazonaws.com/general_pics/delicate_pink_2.png",
             ],
             "description": "Delicate lines, soft colors, pink-blue & green dominant, misty/glimmer shine.",
             "models_works_best_with": "Deliberate, Realistic Vision",
@@ -560,21 +561,20 @@ def inspiration_engine_element(project_uuid, position="explorer", shot_uuid=None
                     preview1, preview2, preview_3 = st.columns([1, 1, 1])
                     with preview1:
                         preset_images = items[[item["name"] for item in items].index(preset_style)]["images"]
-  
+
                         st.image(preset_images[0])
-   
+
                     with preview2:
                         st.info(
-                        f"""**Recommended animation styling models:** {items[[item["name"] for item in items].index(preset_style)]["models_works_best_with"]}
+                            f"""**Recommended animation styling models:** {items[[item["name"] for item in items].index(preset_style)]["models_works_best_with"]}
                         \n**Recommended workflow:** {items[[item["name"] for item in items].index(preset_style)]["workflows_works_best_with"]}
                         \n**Created by:** {items[[item["name"] for item in items].index(preset_style)]["created_by"]}
                         \n**Description:** {items[[item["name"] for item in items].index(preset_style)]["description"]}
 """
-                                )
+                        )
 
-                    with preview_3:                        
+                    with preview_3:
                         st.video(items[[item["name"] for item in items].index(preset_style)]["example_video"])
-              
 
                 else:
                     st.session_state["list_of_style_references"] = []
@@ -656,7 +656,7 @@ def inspiration_engine_element(project_uuid, position="explorer", shot_uuid=None
                 help = ""
 
             st.markdown("***")
-            if st.button("Generate images", type="primary",disabled=button_status, help=help):
+            if st.button("Generate images", type="primary", disabled=button_status, help=help):
 
                 if type_of_style_input == "Choose From List":
                     st.session_state["list_of_style_references"] = preset_images