Merge pull request #3586 from DAurielS/novelai-image-update Added support for NovelAI Diffusion V4 Full via API to Image Generation extension.
Signed| @@ -2011,6 +2011,10 @@ async function loadVladModels() { | ||
| 2011 | 2011 | async function loadNovelModels() { |
| 2012 | 2012 | return [ |
| 2013 | 2013 | { |
| 2014 | + value: 'nai-diffusion-4-full', | |
| 2015 | + text: 'NAI Diffusion Anime V4 (Full)', | |
| 2016 | + }, | |
| 2017 | + { | |
| 2014 | 2018 | value: 'nai-diffusion-4-curated-preview', |
| 2015 | 2019 | text: 'NAI Diffusion Anime V4 (Curated Preview)', |
| 2016 | 2020 | }, |
| @@ -2333,7 +2337,10 @@ function processReply(str) { | ||
| 2333 | 2337 | str = str.replaceAll('“', ''); |
| 2334 | 2338 | str = str.replaceAll('\n', ', '); |
| 2335 | 2339 | str = str.normalize('NFD'); |
| 2336 | - str = str.replace(/[^a-zA-Z0-9.,:_(){}<>[\]\-']+/g, ' '); | |
| 2340 | + | |
| 2341 | + // Strip out non-alphanumeric characters barring model syntax exceptions | |
| 2342 | + str = str.replace(/[^a-zA-Z0-9.,:_(){}<>[\]\-'|#]+/g, ' '); | |
| 2343 | + | |
| 2337 | 2344 | str = str.replace(/\s+/g, ' '); // Collapse multiple whitespaces into one |
| 2338 | 2345 | str = str.trim(); |
| 2339 | 2346 | |
| @@ -3227,7 +3234,8 @@ function getNovelParams() { | ||
| 3227 | 3234 | extension_settings.sd.scheduler = 'karras'; |
| 3228 | 3235 | } |
| 3229 | 3236 | |
| 3230 | 3237 | if (extension_settings.sd.sampler === 'ddim' || extension_settings.sd.model === 'nai-diffusion-4-curated-preview') { |
| 3238 | + ['nai-diffusion-4-curated-preview', 'nai-diffusion-4-full'].includes(extension_settings.sd.model)) { | |
| 3231 | 3239 | sm = false; |
| 3232 | 3240 | sm_dyn = false; |
| 3233 | 3241 | } |