From 41efd6584dbb8dc6b24dd21a20e5734b42b6d0b4 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Fri, 24 May 2024 09:46:18 -0400 Subject: [PATCH] fix cached prompts --- CHANGELOG.md | 2 +- modules/loader.py | 2 +- modules/prompt_parser_diffusers.py | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf22f977..87bb975dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for SD.Next -## Update for 2024-05-22 +## Update for 2024-05-24 - **Features**: - **ModernUI** preview of the new [ModernUI](https://github.com/BinaryQuantumSoul/sdnext-modernui) diff --git a/modules/loader.py b/modules/loader.py index 64e617890..04e6dfca2 100644 --- a/modules/loader.py +++ b/modules/loader.py @@ -1,10 +1,10 @@ from __future__ import annotations +from functools import partial import re import sys import logging import warnings import urllib3 -from functools import partial from modules import timer, errors initialized = False diff --git a/modules/prompt_parser_diffusers.py b/modules/prompt_parser_diffusers.py index 542857913..67a714426 100644 --- a/modules/prompt_parser_diffusers.py +++ b/modules/prompt_parser_diffusers.py @@ -154,7 +154,11 @@ def encode_prompts(pipe, p, prompts: list, negative_prompts: list, steps: int, c for i in range(max(len(positive_schedule), len(negative_schedule))): positive_prompt = positive_schedule[i % len(positive_schedule)] negative_prompt = negative_schedule[i % len(negative_schedule)] - results = cache.get(positive_prompt + negative_prompt, None) + if cache.get('model_type', None) != shared.sd_model_type: + cache[positive_prompt + negative_prompt] = None + results = None + else: + results = cache.get(positive_prompt + negative_prompt, None) if results is None: results = get_weighted_text_embeddings(pipe, positive_prompt, negative_prompt, clip_skip)