diff options
| -rw-r--r-- | modules/interrogate.py | 2 | ||||
| -rw-r--r-- | modules/txt2img.py | 4 |
2 files changed, 3 insertions, 3 deletions
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')]
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)
|