mirror of
https://github.com/Sygil-Dev/sygil-webui.git
synced 2024-12-14 14:05:36 +03:00
Skip WebUI prompt if --bridge passed, Detailed error messages if bridgeData.py fails to load (#1483)
# Description Please include: - [x] relevant motivation - [x] a summary of the change - [ ] which issue is fixed. - [x] any additional dependencies that are required for this change. Fixes a small typo of "Bridg" in horde_bridge.sh Makes webui.sh skip asking for StreamLit/Gradio if --bridge is passed More detailed error messages if bridgeData.py is missing/malformed (previously it would only say no bridgeData found, which caused confusion when bridgeData did exist but was incorrectly formatted) # Checklist: - [x] I have changed the base branch to `dev` - [x] I have performed a self-review of my own code - [x] I have commented my code in hard-to-understand areas - [ ] I have made corresponding changes to the documentation Co-authored-by: mechanopixel <takatarumc@gmail.com>
This commit is contained in:
parent
994341efba
commit
2215a3b403
@ -162,7 +162,7 @@ start_initialization () {
|
|||||||
echo "Your model file does not exist! Place it in 'models/ldm/stable-diffusion-v1' with the name 'model.ckpt'."
|
echo "Your model file does not exist! Place it in 'models/ldm/stable-diffusion-v1' with the name 'model.ckpt'."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
printf "\nStarting Stable Horde Bridg: Please Wait...\n"; python scripts/relauncher.py --bridge -v "$@"; break;
|
printf "\nStarting Stable Horde Bridge: Please Wait...\n"; python scripts/relauncher.py --bridge -v "$@"; break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2783,8 +2783,19 @@ if __name__ == '__main__':
|
|||||||
if opt.bridge:
|
if opt.bridge:
|
||||||
try:
|
try:
|
||||||
import bridgeData as cd
|
import bridgeData as cd
|
||||||
except:
|
except ModuleNotFoundError as e:
|
||||||
|
logger.warning("No bridgeData found. Falling back to default where no CLI args are set.")
|
||||||
|
logger.warning(str(e))
|
||||||
|
except SyntaxError as e:
|
||||||
|
logger.warning("bridgeData found, but is malformed. Falling back to default where no CLI args are set.")
|
||||||
|
logger.warning(str(e))
|
||||||
|
except Exception as e:
|
||||||
logger.warning("No bridgeData found, use default where no CLI args are set")
|
logger.warning("No bridgeData found, use default where no CLI args are set")
|
||||||
|
logger.warning(str(e))
|
||||||
|
finally:
|
||||||
|
try: # check if cd exists (i.e. bridgeData loaded properly)
|
||||||
|
cd
|
||||||
|
except: # if not, create defaults
|
||||||
class temp(object):
|
class temp(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
random.seed()
|
random.seed()
|
||||||
|
7
webui.sh
7
webui.sh
@ -154,6 +154,13 @@ post_processor_model_loading () {
|
|||||||
|
|
||||||
# Show the user a prompt asking them which version of the WebUI they wish to use, Streamlit or Gradio
|
# Show the user a prompt asking them which version of the WebUI they wish to use, Streamlit or Gradio
|
||||||
launch_webui () {
|
launch_webui () {
|
||||||
|
# skip the prompt if --bridge command-line argument is detected
|
||||||
|
for arg in "$@"; do
|
||||||
|
if [ "$arg" == "--bridge" ]; then
|
||||||
|
python -u scripts/relauncher.py "$@"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
done
|
||||||
printf "\n\n########## LAUNCH USING STREAMLIT OR GRADIO? ##########\n\n"
|
printf "\n\n########## LAUNCH USING STREAMLIT OR GRADIO? ##########\n\n"
|
||||||
printf "Do you wish to run the WebUI using the Gradio or StreamLit Interface?\n\n"
|
printf "Do you wish to run the WebUI using the Gradio or StreamLit Interface?\n\n"
|
||||||
printf "Streamlit: \nHas A More Modern UI \nMore Features Planned \nWill Be The Main UI Going Forward \nCurrently In Active Development \nMissing Some Gradio Features\n\n"
|
printf "Streamlit: \nHas A More Modern UI \nMore Features Planned \nWill Be The Main UI Going Forward \nCurrently In Active Development \nMissing Some Gradio Features\n\n"
|
||||||
|
Loading…
Reference in New Issue
Block a user