Merge branch 'henk717:united' into united

This commit is contained in:
ebolam
2022-08-17 09:07:01 -04:00
committed by GitHub
3 changed files with 13 additions and 5 deletions

View File

@ -11,11 +11,15 @@ IF EXIST "Uninstall\unins000.exe" (
start Uninstall\unins000.exe start Uninstall\unins000.exe
exit exit
) ELSE ( ) ELSE (
echo This will remove all KoboldAI folders that do not contain user data echo This will remove all KoboldAI folders that do not contain user data.
echo DO NOT CONTINUE IF KOBOLDAI IS NOT IN ITS OWN FOLDER! OTHERWISE YOUR OTHER DATA IN THIS FOLDER WILL BE DELETED AS WELL!
pause pause
GOTO UNINSTALL set /P D=Type DELETE if you wish to continue the uninstallation:
) )
IF %D%==DELETE GOTO UNINSTALL
exit
:UNINSTALL :UNINSTALL
echo Uninstallation in progress, please wait... echo Uninstallation in progress, please wait...
set DM=Y set DM=Y

View File

@ -1039,6 +1039,8 @@ def savesettings():
if(vars.seed_specified): if(vars.seed_specified):
js["seed"] = vars.seed js["seed"] = vars.seed
else:
js["seed"] = None
js["newlinemode"] = vars.newlinemode js["newlinemode"] = vars.newlinemode
@ -1154,9 +1156,12 @@ def processsettings(js):
if("seed" in js): if("seed" in js):
vars.seed = js["seed"] vars.seed = js["seed"]
if(vars.seed is not None):
vars.seed_specified = True vars.seed_specified = True
else: else:
vars.seed_specified = False vars.seed_specified = False
else:
vars.seed_specified = False
if("antemplate" in js): if("antemplate" in js):
vars.setauthornotetemplate = js["antemplate"] vars.setauthornotetemplate = js["antemplate"]

View File

@ -175,7 +175,6 @@ def num_layers(config):
from flask_socketio import emit from flask_socketio import emit
class Send_to_socketio(object): class Send_to_socketio(object):
def write(self, bar): def write(self, bar):
print("should be emitting: ", bar, end="")
time.sleep(0.01) time.sleep(0.01)
try: try:
emit('from_server', {'cmd': 'model_load_status', 'data': bar.replace(" ", " ")}, broadcast=True) emit('from_server', {'cmd': 'model_load_status', 'data': bar.replace(" ", " ")}, broadcast=True)