From 6acccbf7a4dc7992be5823ead968baacf1cf3bb1 Mon Sep 17 00:00:00 2001 From: Henk Date: Sun, 14 Aug 2022 02:09:53 +0200 Subject: [PATCH 1/3] Save null seed to settings --- aiserver.py | 7 ++++++- utils.py | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aiserver.py b/aiserver.py index 7adf0e0c..5002feb5 100644 --- a/aiserver.py +++ b/aiserver.py @@ -1038,6 +1038,8 @@ def savesettings(): if(vars.seed_specified): js["seed"] = vars.seed + else: + js["seed"] = None js["newlinemode"] = vars.newlinemode @@ -1153,7 +1155,10 @@ def processsettings(js): if("seed" in js): vars.seed = js["seed"] - vars.seed_specified = True + if(vars.seed is not None): + vars.seed_specified = True + else: + vars.seed_specified = False else: vars.seed_specified = False diff --git a/utils.py b/utils.py index f7ea95b8..9a35c623 100644 --- a/utils.py +++ b/utils.py @@ -175,7 +175,6 @@ def num_layers(config): from flask_socketio import emit class Send_to_socketio(object): def write(self, bar): - print("should be emitting: ", bar, end="") time.sleep(0.01) try: emit('from_server', {'cmd': 'model_load_status', 'data': bar.replace(" ", " ")}, broadcast=True) From 47ee392404a6e63994855a1e5fc11ab82a30f148 Mon Sep 17 00:00:00 2001 From: Henk Date: Tue, 16 Aug 2022 14:51:17 +0200 Subject: [PATCH 2/3] Uninstall Warning --- Uninstall.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Uninstall.bat b/Uninstall.bat index ed143996..645f4053 100644 --- a/Uninstall.bat +++ b/Uninstall.bat @@ -11,7 +11,8 @@ IF EXIST "Uninstall\unins000.exe" ( start Uninstall\unins000.exe exit ) 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 THE FOLDER WILL BE DELETED AS WELL! pause GOTO UNINSTALL ) From 40268c8437840d1e3be689b7089d94b277e4b9fb Mon Sep 17 00:00:00 2001 From: Henk Date: Tue, 16 Aug 2022 15:15:08 +0200 Subject: [PATCH 3/3] Even clearer uninstall warning --- Uninstall.bat | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Uninstall.bat b/Uninstall.bat index 645f4053..ae7a4201 100644 --- a/Uninstall.bat +++ b/Uninstall.bat @@ -12,11 +12,14 @@ IF EXIST "Uninstall\unins000.exe" ( exit ) ELSE ( 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 THE FOLDER WILL BE DELETED AS WELL! - pause - GOTO UNINSTALL + 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 + set /P D=Type DELETE if you wish to continue the uninstallation: ) +IF %D%==DELETE GOTO UNINSTALL +exit + :UNINSTALL echo Uninstallation in progress, please wait... set DM=Y