From 2996e43ff71ca50f6e5b64676f998946d8041d19 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sat, 27 Jan 2024 14:49:50 +0900
Subject: [PATCH 1/2] fix txt2img_upscale

use force_enable_hr to set p.enable_hr = True
allow Script.setup() have access to the correct value

add a comment for p.txt2img_upscale
---
 modules/txt2img.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/txt2img.py b/modules/txt2img.py
index 4efcb4c3..fc56b8a8 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -60,10 +60,10 @@ def txt2img_upscale(id_task: str, request: gr.Request, gallery, gallery_index, g
     assert len(gallery) > 0, 'No image to upscale'
     assert 0 <= gallery_index < len(gallery), f'Bad image index: {gallery_index}'
 
-    p = txt2img_create_processing(id_task, request, *args)
-    p.enable_hr = True
+    p = txt2img_create_processing(id_task, request, *args, force_enable_hr=True)
     p.batch_size = 1
     p.n_iter = 1
+    # txt2img_upscale attribute that signifies this is called by txt2img_upscale
     p.txt2img_upscale = True
 
     geninfo = json.loads(generation_info)

From 486aeda3a75ed20e75d85d6ae6845d66d1cbe1de Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sat, 27 Jan 2024 19:34:07 +0900
Subject: [PATCH 2/2] fix CLIP Interrogator topN regex

Co-Authored-By: Martin Rizzo <60830236+martin-rizzo@users.noreply.github.com>
---
 modules/interrogate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/interrogate.py b/modules/interrogate.py
index 35a627ca..c93e7aa8 100644
--- a/modules/interrogate.py
+++ b/modules/interrogate.py
@@ -17,7 +17,7 @@ clip_model_name = 'ViT-L/14'
 
 Category = namedtuple("Category", ["name", "topn", "items"])
 
-re_topn = re.compile(r"\.top(\d+)\.")
+re_topn = re.compile(r"\.top(\d+)$")
 
 def category_types():
     return [f.stem for f in Path(shared.interrogator.content_dir).glob('*.txt')]