holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta

Browse Source
This commit is contained in:
cmdr2 2022-12-07 13:12:02 +05:30
commit 273525e6f9
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/media/js/engine.js
View File

@ -743,6 +743,8 @@
"use_face_correction": 'string', "use_face_correction": 'string',
"use_upscale": 'string', "use_upscale": 'string',
"use_vae_model": 'string', "use_vae_model": 'string',
"use_hypernetwork_model": 'string',
"hypernetwork_strength": 'number',
} }
// Higer values will result in... // Higer values will result in...

6
ui/media/js/main.js
View File

@ -879,6 +879,10 @@ function getCurrentUserRequest() {
if (useUpscalingField.checked) { if (useUpscalingField.checked) {
newTask.reqBody.use_upscale = upscaleModelField.value newTask.reqBody.use_upscale = upscaleModelField.value
} }
if (hypernetworkModelField.value) {
newTask.reqBody.use_hypernetwork_model = hypernetworkModelField.value
newTask.reqBody.hypernetwork_strength = parseFloat(hypernetworkStrengthField.value)
}
return newTask return newTask
} }
@ -1185,7 +1189,7 @@ async function getModels() {
const stableDiffusionOptions = modelsOptions['stable-diffusion'] const stableDiffusionOptions = modelsOptions['stable-diffusion']
const vaeOptions = modelsOptions['vae'] const vaeOptions = modelsOptions['vae']
const hypernetworkOptions = modelOptions['hypernetwork'] const hypernetworkOptions = modelsOptions['hypernetwork']
vaeOptions.unshift('') // add a None option vaeOptions.unshift('') // add a None option
hypernetworkOptions.unshift('') // add a None option hypernetworkOptions.unshift('') // add a None option

6
ui/sd_internal/runtime.py
View File

@ -28,7 +28,6 @@ from gfpgan import GFPGANer
from basicsr.archs.rrdbnet_arch import RRDBNet from basicsr.archs.rrdbnet_arch import RRDBNet
from realesrgan import RealESRGANer from realesrgan import RealESRGANer
from . import hypernetwork
from server import HYPERNETWORK_MODEL_EXTENSIONS# , STABLE_DIFFUSION_MODEL_EXTENSIONS, VAE_MODEL_EXTENSIONS from server import HYPERNETWORK_MODEL_EXTENSIONS# , STABLE_DIFFUSION_MODEL_EXTENSIONS, VAE_MODEL_EXTENSIONS
from threading import Lock from threading import Lock
@ -450,6 +449,11 @@ def is_hypernetwork_reload_necessary(req: Request):
return needs_model_reload return needs_model_reload
def load_hypernetwork(): def load_hypernetwork():
if thread_data.test_sd2:
# Not yet supported in SD2
return
from . import hypernetwork
if thread_data.hypernetwork_file is not None: if thread_data.hypernetwork_file is not None:
try: try:
loaded = False loaded = False