Merge branch 'release' into staging
| @@ -1994,6 +1994,10 @@ async function loadNovelModels() { | ||
| 1994 | 1994 | ]; |
| 1995 | 1995 | } |
| 1996 | 1996 | |
| 1997 | +function loadNovelSchedulers() { | |
| 1998 | + return ['karras', 'native', 'exponential', 'polyexponential']; | |
| 1999 | +} | |
| 2000 | + | |
| 1997 | 2001 | async function loadComfyModels() { |
| 1998 | 2002 | if (!extension_settings.sd.comfy_url) { |
| 1999 | 2003 | return []; |
| @@ -2031,7 +2035,7 @@ async function loadSchedulers() { | ||
| 2031 | 2035 | schedulers = await getAutoRemoteSchedulers(); |
| 2032 | 2036 | break; |
| 2033 | 2037 | case sources.novel: |
| 2034 | - schedulers = ['karras', 'native', 'exponential', 'polyexponential']; | |
| 2038 | + schedulers = loadNovelSchedulers(); | |
| 2035 | 2039 | break; |
| 2036 | 2040 | case sources.vlad: |
| 2037 | 2041 | schedulers = ['N/A']; |
| @@ -3177,7 +3181,8 @@ function getNovelParams() { | ||
| 3177 | 3181 | let sm_dyn = extension_settings.sd.novel_sm_dyn; |
| 3178 | 3182 | |
| 3179 | 3183 | // If a source was never changed after the scheduler setting was added, we need to set it to 'karras' for compatibility. |
| 3180 | - if (!extension_settings.sd.scheduler || extension_settings.sd.scheduler === 'normal') { | |
| 3184 | + const schedulers = loadNovelSchedulers(); | |
| 3185 | + if (!schedulers.includes(extension_settings.sd.scheduler)) { | |
| 3181 | 3186 | extension_settings.sd.scheduler = 'karras'; |
| 3182 | 3187 | } |
| 3183 | 3188 | |