From 7af1cac1843b2b6bc21fb9b6d8a45b92702e6800 Mon Sep 17 00:00:00 2001 From: somebody Date: Fri, 21 Oct 2022 21:03:42 -0500 Subject: [PATCH] Convert wi upload to a post request --- aiserver.py | 7 ++++--- static/koboldai.js | 23 ++++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/aiserver.py b/aiserver.py index 9b6656f5..ca200088 100644 --- a/aiserver.py +++ b/aiserver.py @@ -8534,10 +8534,10 @@ def UI_2_upload_world_info_folder(data): logger.debug("Calcing AI Text from WI Upload") koboldai_vars.calc_ai_text() -@socketio.on('import_world_info') +@app.route("/upload_wi", methods=["POST"]) @logger.catch -def UI_2_import_world_info(data): - wi_data = data["data"] +def UI_2_import_world_info(): + wi_data = request.get_json() uids = {} for folder_name, children in wi_data["folders"].items(): @@ -8558,6 +8558,7 @@ def UI_2_import_world_info(data): wpp=entry_data["wpp"], ) koboldai_vars.worldinfo_v2.add_item_to_folder(uids[child], folder_name) + return ":)" @socketio.on("search_wi") @logger.catch diff --git a/static/koboldai.js b/static/koboldai.js index e4c56284..96fa8bd4 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -4001,7 +4001,7 @@ function sendPromptConfiguration() { $(".prompt-config-ph").remove(); } -function loadNAILorebook(data, filename) { +async function loadNAILorebook(data, filename) { let lorebookVersion = data.lorebookVersion; let wi_data = {folders: {[filename]: []}, entries: {}}; console.log(`Loading NAI lorebook version ${lorebookVersion}`); @@ -4036,7 +4036,16 @@ function loadNAILorebook(data, filename) { i++; } - socket.emit("import_world_info", {data: wi_data}); + + let r = await fetch("/upload_wi", { + method: "POST", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(wi_data) + }); + + if (!r.ok) alert("WI upload errored! Please report this."); } async function loadKoboldData(data, filename) { @@ -4046,7 +4055,15 @@ async function loadKoboldData(data, filename) { socket.emit("load_story_list", ""); } else if (data.folders !== undefined && data.entries !== undefined) { // World Info Folder - socket.emit("import_world_info", {data: data}); + let r = await fetch("/upload_wi", { + method: "POST", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(data) + }); + + if (!r.ok) alert("WI upload errored! Please report this."); } else { // Bad data console.error("Bad data!");