From 6a5901a3fd5bab8d5d5933f56d1f0f991535793d Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 8 May 2023 12:45:22 +0300
Subject: update changelog

---
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d2f96e5..1ae81232 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+## Upcoming 1.2.0
+
+### Features:
+ * do not load wait for stable diffusion model to load at startup
+ * add filename patterns: [denoising]
+ * directory hiding for extra networks: dirs starting with . will hide their cards on extra network tabs unless specifically searched for
+ * Lora: for the `<...>` text in prompt, use name of Lora that is in the metdata of the file, if present, instead of filename (both can be used to activate lora)
+ * Lora: read infotext params from kohya-ss's extension parameters if they are present and if his extension is not active
+ * Lora: Fix some Loras not working (ones that have 3x3 convolution layer)
+ * Lora: add an option to use old method of applying loras (producing same results as with kohya-ss)
+
+### Minor:
+ * --subpath option for gradio for use with reverse proxy
+ * linux/OSX: use existing virtualenv if already active (the VIRTUAL_ENV environment variable)
+ * possible frontend optimization: do not apply localizations if there are none
+ * Add extra `None` option for VAE in XYZ plot
+ * print error to console when batch processing in img2img fails
+ * create HTML for extra network pages only on demand
+ * allow directories starting with . to still list their models for lora, checkpoints, etc
+
+### Extensions:
+ * Tooltip localization support
+
+### Bug Fixes:
+ * re-add /docs endpoint
+ * fix gamepad navigation
+ * make the lightbox fullscreen image function properly
+ * fix squished thumbnails in extras tab
+ * keep "search" filter for extra networks when user refreshes the tab (previously it showed everthing after you refreshed)
+
+
 ## 1.1.1
 ### Bug Fixes:
  * fix an error that prevents running webui on torch<2.0 without --disable-safe-unpickle
-- 
cgit v1.2.3


From 505a10ad928eb11849828c88850ce3e5e3566fe4 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 8 May 2023 15:09:20 +0300
Subject: use file modification time instead of current time for #9760

---
 CHANGELOG.md          | 1 +
 modules/ui_tempdir.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ae81232..c56d3a0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
  * make the lightbox fullscreen image function properly
  * fix squished thumbnails in extras tab
  * keep "search" filter for extra networks when user refreshes the tab (previously it showed everthing after you refreshed)
+ * fix webui showing the same image if you configure the generation to always save results into same file
 
 
 ## 1.1.1
diff --git a/modules/ui_tempdir.py b/modules/ui_tempdir.py
index 42a85d3b..67bfd1ec 100644
--- a/modules/ui_tempdir.py
+++ b/modules/ui_tempdir.py
@@ -35,7 +35,8 @@ def check_tmp_file(gradio, filename):
 def save_pil_to_file(pil_image, dir=None):
     already_saved_as = getattr(pil_image, 'already_saved_as', None)
     if already_saved_as and os.path.isfile(already_saved_as):
-        already_saved_as += f'?{int(time())}'
+        already_saved_as += f'?{os.path.getmtime(already_saved_as)}'
+
         register_tmp_file(shared.demo, already_saved_as)
 
         file_obj = Savedfile(already_saved_as)
-- 
cgit v1.2.3


From 31397986e70d20e392d9c3ec70d3aef8ecc2c1ff Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 9 May 2023 22:42:02 +0300
Subject: changelog

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c56d3a0e..95234a98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@
  * Lora: read infotext params from kohya-ss's extension parameters if they are present and if his extension is not active
  * Lora: Fix some Loras not working (ones that have 3x3 convolution layer)
  * Lora: add an option to use old method of applying loras (producing same results as with kohya-ss)
+ * add version to infotext, footer and console output when starting
+ * add links to wiki for filename pattern settings
+ * add extended info for quicksettings setting and use multiselect input instead of a text field
 
 ### Minor:
  * --subpath option for gradio for use with reverse proxy
@@ -17,9 +20,13 @@
  * print error to console when batch processing in img2img fails
  * create HTML for extra network pages only on demand
  * allow directories starting with . to still list their models for lora, checkpoints, etc
+ * put infotext options into their own category in settings tab
+ * do not show licenses page when user selects Show all pages in settings
+ * 
 
 ### Extensions:
  * Tooltip localization support
+ * Add api method to get LoRA models with prompt
 
 ### Bug Fixes:
  * re-add /docs endpoint
@@ -28,6 +35,10 @@
  * fix squished thumbnails in extras tab
  * keep "search" filter for extra networks when user refreshes the tab (previously it showed everthing after you refreshed)
  * fix webui showing the same image if you configure the generation to always save results into same file
+ * fix bug with upscalers not working properly
+ * Fix MPS on PyTorch 2.0.1, Intel Macs
+ * make it so that custom context menu from contextMenu.js only disappears after user's click, ignoring non-user click events
+ * prevent Reload UI button/link from reloading the page when it's not yet ready
 
 
 ## 1.1.1
-- 
cgit v1.2.3


From f07af8db6489544ce593bef2265146a4c829e67b Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 10 May 2023 06:52:51 +0300
Subject: bump gradio version for all suffering musicians

---
 CHANGELOG.md              | 1 +
 requirements.txt          | 2 +-
 requirements_versions.txt | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95234a98..63a6093d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
  * add extended info for quicksettings setting and use multiselect input instead of a text field
 
 ### Minor:
+ * gradio bumped to 3.29.0
  * --subpath option for gradio for use with reverse proxy
  * linux/OSX: use existing virtualenv if already active (the VIRTUAL_ENV environment variable)
  * possible frontend optimization: do not apply localizations if there are none
diff --git a/requirements.txt b/requirements.txt
index c08c82d7..35987a13 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ basicsr
 fonts
 font-roboto
 gfpgan
-gradio==3.28.1
+gradio==3.29.0
 numpy
 omegaconf
 opencv-contrib-python
diff --git a/requirements_versions.txt b/requirements_versions.txt
index cfdce216..7bce02e5 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -3,7 +3,7 @@ transformers==4.25.1
 accelerate==0.18.0
 basicsr==1.4.2
 gfpgan==1.3.8
-gradio==3.28.1
+gradio==3.29.0
 numpy==1.23.5
 Pillow==9.4.0
 realesrgan==0.3.0
-- 
cgit v1.2.3


From f5ea1e9d928e0d45b3ebcd8ddd1cacbc6a96e184 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 10 May 2023 07:26:31 +0300
Subject: bump torch version

---
 CHANGELOG.md | 2 +-
 launch.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a6093d..cf3fef3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 ### Minor:
  * gradio bumped to 3.29.0
+ * torch bumped to 2.0.1
  * --subpath option for gradio for use with reverse proxy
  * linux/OSX: use existing virtualenv if already active (the VIRTUAL_ENV environment variable)
  * possible frontend optimization: do not apply localizations if there are none
@@ -23,7 +24,6 @@
  * allow directories starting with . to still list their models for lora, checkpoints, etc
  * put infotext options into their own category in settings tab
  * do not show licenses page when user selects Show all pages in settings
- * 
 
 ### Extensions:
  * Tooltip localization support
diff --git a/launch.py b/launch.py
index 2a33adc8..cfc0cffa 100644
--- a/launch.py
+++ b/launch.py
@@ -237,7 +237,7 @@ def run_extensions_installers(settings_file):
 
 
 def prepare_environment():
-    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.0 torchvision==0.15.1 --extra-index-url https://download.pytorch.org/whl/cu118")
+    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.1 torchvision==0.15.2 --extra-index-url https://download.pytorch.org/whl/cu118")
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
 
     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17')
-- 
cgit v1.2.3


From 8ca50f8240fc1b4400ba59be50ad7a75b99cfbcb Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Thu, 11 May 2023 14:49:14 +0300
Subject: fix broken prompts from file

---
 CHANGELOG.md                 |  1 +
 scripts/prompts_from_file.py | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf3fef3d..1a0f7ae5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
  * Fix MPS on PyTorch 2.0.1, Intel Macs
  * make it so that custom context menu from contextMenu.js only disappears after user's click, ignoring non-user click events
  * prevent Reload UI button/link from reloading the page when it's not yet ready
+ * fix prompts from file script failing to read contents from a drag/drop file
 
 
 ## 1.1.1
diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 76dc5778..f168389c 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -100,30 +100,29 @@ def cmdargs(line):
 
 def load_prompt_file(file):
     if file is None:
-        lines = []
+        return None, gr.update(), gr.update(lines=7)
     else:
         lines = [x.strip() for x in file.decode('utf8', errors='ignore').split("\n")]
-
-    return None, "\n".join(lines), gr.update(lines=7)
+        return None, "\n".join(lines), gr.update(lines=7)
 
 
 class Script(scripts.Script):
     def title(self):
         return "Prompts from file or textbox"
 
-    def ui(self, is_img2img):       
+    def ui(self, is_img2img):
         checkbox_iterate = gr.Checkbox(label="Iterate seed every line", value=False, elem_id=self.elem_id("checkbox_iterate"))
         checkbox_iterate_batch = gr.Checkbox(label="Use same random seed for all lines", value=False, elem_id=self.elem_id("checkbox_iterate_batch"))
 
         prompt_txt = gr.Textbox(label="List of prompt inputs", lines=1, elem_id=self.elem_id("prompt_txt"))
         file = gr.File(label="Upload prompt inputs", type='binary', elem_id=self.elem_id("file"))
 
-        file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt])
+        file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt], show_progress=False)
 
         # We start at one line. When the text changes, we jump to seven lines, or two lines if no \n.
         # We don't shrink back to 1, because that causes the control to ignore [enter], and it may
         # be unclear to the user that shift-enter is needed.
-        prompt_txt.change(lambda tb: gr.update(lines=7) if ("\n" in tb) else gr.update(lines=2), inputs=[prompt_txt], outputs=[prompt_txt])
+        prompt_txt.change(lambda tb: gr.update(lines=7) if ("\n" in tb) else gr.update(lines=2), inputs=[prompt_txt], outputs=[prompt_txt], show_progress=False)
         return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]
 
     def run(self, p, checkbox_iterate, checkbox_iterate_batch, prompt_txt: str):
-- 
cgit v1.2.3


From 231562ea13e4f697953bdbabd6b76b22a88c587b Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 13 May 2023 08:16:20 +0300
Subject: update changelog for release

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a0f7ae5..d1727864 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
-## Upcoming 1.2.0
+## 1.2.0
 
 ### Features:
- * do not load wait for stable diffusion model to load at startup
+ * do not wait for stable diffusion model to load at startup
  * add filename patterns: [denoising]
  * directory hiding for extra networks: dirs starting with . will hide their cards on extra network tabs unless specifically searched for
  * Lora: for the `<...>` text in prompt, use name of Lora that is in the metdata of the file, if present, instead of filename (both can be used to activate lora)
-- 
cgit v1.2.3


From 27f7fbf35cd72d547d830f97828ee13d3d2009aa Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 13 May 2023 20:24:48 +0300
Subject: update readme

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1727864..b586b271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## Upcoming 1.2.1
+
+### Features:
+ * add an option to always refer to lora by filenames
+
+### Bug Fixes:
+ * never refer to lora by an alias if multiple loras have same alias or the alias is called none
+ * fix upscalers disappearing after the user reloads UI
+ * allow bf16 in safe unpickler (resolves problems with loading some loras)
+ * allow web UI to be ran fully offline
+
 ## 1.2.0
 
 ### Features:
-- 
cgit v1.2.3