Merge branch 'release' into staging

2d4bae17ccc71a9515e32d9b8c4ff259cfb14d4f

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: b7a96b3143ca15f1037cd1f93d71fc0f04c9f2be d0e1c3287a828eff65a2c92380aaad9c38531cee
1 files changed, +7 -2Ignore whitespace
public/scripts/extensions/stable-diffusion/index.js+7 -2
@@ -1994,6 +1994,10 @@ async function loadNovelModels() {
1994 ];1994 ];
1995}1995}
19961996
1997function loadNovelSchedulers() {
1998 return ['karras', 'native', 'exponential', 'polyexponential'];
1999}
2000
1997async function loadComfyModels() {2001async function loadComfyModels() {
1998 if (!extension_settings.sd.comfy_url) {2002 if (!extension_settings.sd.comfy_url) {
1999 return [];2003 return [];
@@ -2031,7 +2035,7 @@ async function loadSchedulers() {
2031 schedulers = await getAutoRemoteSchedulers();2035 schedulers = await getAutoRemoteSchedulers();
2032 break;2036 break;
2033 case sources.novel:2037 case sources.novel:
2034 schedulers = ['karras', 'native', 'exponential', 'polyexponential'];2038 schedulers = loadNovelSchedulers();
2035 break;2039 break;
2036 case sources.vlad:2040 case sources.vlad:
2037 schedulers = ['N/A'];2041 schedulers = ['N/A'];
@@ -3177,7 +3181,8 @@ function getNovelParams() {
3177 let sm_dyn = extension_settings.sd.novel_sm_dyn;3181 let sm_dyn = extension_settings.sd.novel_sm_dyn;
31783182
3179 // If a source was never changed after the scheduler setting was added, we need to set it to 'karras' for compatibility.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 extension_settings.sd.scheduler = 'karras';3186 extension_settings.sd.scheduler = 'karras';
3182 }3187 }
31833188