Added global negative prompt on config file. (#1670)

Sygil-Dev · Nov 17, 2022 · 269107a · 269107a
2 parents ef482ff + ef4cf8b
commit 269107a
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,24 @@
+[submodule "backend"]
+	path = backend
+	url = ../../Sygil-Dev/dalle-flow.git
+[submodule "backend/clip-as-service"]
+	path = backend/clip-as-service
+	url = ../../jina-ai/clip-as-service.git
+[submodule "backend/clipseg"]
+	path = backend/clipseg
+	url = ../../timojl/clipseg.git
+[submodule "backend/dalle_flow"]
+	path = backend/dalle_flow
+	url = ../../Sygil-Dev/dalle-flow.git
+[submodule "backend/glid-3-xl"]
+	path = backend/glid-3-xl
+	url = ../../jina-ai/glid-3-xl.git
+[submodule "backend/latent-diffusion"]
+	path = backend/latent-diffusion
+	url = ../../CompVis/latent-diffusion.git
+[submodule "backend/stable-diffusion"]
+	path = backend/stable-diffusion
+	url = ../../AmericanPresidentJimmyCarter/stable-diffusion.git
+[submodule "backend/SwinIR"]
+	path = backend/SwinIR
+	url = ../../jina-ai/SwinIR.git
diff --git a/backend/SwinIR b/backend/SwinIR
diff --git a/backend/clip-as-service b/backend/clip-as-service
diff --git a/backend/clipseg b/backend/clipseg
diff --git a/backend/dalle_flow b/backend/dalle_flow
diff --git a/backend/glid-3-xl b/backend/glid-3-xl
diff --git a/backend/latent-diffusion b/backend/latent-diffusion
diff --git a/backend/stable-diffusion b/backend/stable-diffusion
diff --git a/configs/webui/webui_streamlit.yaml b/configs/webui/webui_streamlit.yaml
@@ -70,6 +70,7 @@ general:
 admin:
     hide_server_setting: False
     hide_browser_setting: False
+    global_negative_prompt: ""
 
 debug:
     enable_hydralit: False

diff --git a/scripts/img2img.py b/scripts/img2img.py
@@ -378,6 +378,10 @@ def layout():
 			placeholder = "A corgi wearing a top hat as an oil painting."
 			prompt = st.text_area("Input Text","", placeholder=placeholder, height=54)
 			sygil_suggestions.suggestion_area(placeholder)
+
+			if "defaults" in st.session_state:
+				if st.session_state['defaults'].admin.global_negative_prompt:
+					prompt += f"### {st.session_state['defaults'].admin.global_negative_prompt}"
 
 		# Every form must have a submit button, the extra blank spaces is a temp way to align it with the input field. Needs to be done in CSS or some other way.
 		img2img_generate_col.write("")

diff --git a/scripts/txt2img.py b/scripts/txt2img.py
@@ -426,6 +426,12 @@ def layout():
             placeholder = "A corgi wearing a top hat as an oil painting."
             prompt = st.text_area("Input Text","", placeholder=placeholder, height=54)
             sygil_suggestions.suggestion_area(placeholder)
+
+            if "defaults" in st.session_state:
+                if st.session_state['defaults'].admin.global_negative_prompt:
+                    prompt += f"### {st.session_state['defaults'].admin.global_negative_prompt}"
+
+            print(prompt)
 
         # creating the page layout using columns
         col1, col2, col3 = st.columns([2,5,2], gap="large")

diff --git a/scripts/txt2vid.py b/scripts/txt2vid.py
@@ -1601,6 +1601,10 @@ def layout():
             placeholder = "A corgi wearing a top hat as an oil painting."
             prompt = st.text_area("Input Text","", placeholder=placeholder, height=54)
             sygil_suggestions.suggestion_area(placeholder)
+
+            if "defaults" in st.session_state:
+                if st.session_state['defaults'].admin.global_negative_prompt:
+                    prompt += f"### {st.session_state['defaults'].admin.global_negative_prompt}"
 
         # Every form must have a submit button, the extra blank spaces is a temp way to align it with the input field. Needs to be done in CSS or some other way.
         generate_col1.write("")