diff --git a/klite.embd b/klite.embd index fa0f955c6..dac1b1c65 100644 --- a/klite.embd +++ b/klite.embd @@ -6704,6 +6704,9 @@ Current version: 77 headers: { 'Content-Type': 'application/json', }, + body: JSON.stringify({ + "genkey": lastcheckgenkey + }), }) .then((response) => response.json()) .then((data) => {}) @@ -7171,6 +7174,8 @@ Current version: 77 { lastcheckgenkey = "KCPP"+(Math.floor(1000 + Math.random() * 9000)).toString(); submit_payload.params.genkey = lastcheckgenkey; + }else{ + lastcheckgenkey = ""; } //v2 api specific fields diff --git a/koboldcpp.py b/koboldcpp.py index 8ad3c7944..a82503bb7 100755 --- a/koboldcpp.py +++ b/koboldcpp.py @@ -661,7 +661,15 @@ class ServerRequestHandler(http.server.SimpleHTTPRequestHandler): return if self.path.endswith('/api/extra/abort'): - if requestsinqueue==0: + multiuserkey = "" + try: + tempbody = json.loads(body) + multiuserkey = tempbody.get('genkey', "") + except ValueError as e: + multiuserkey = "" + pass + + if (multiuserkey!="" and multiuserkey==currentusergenkey) or requestsinqueue==0: ag = handle.abort_generate() time.sleep(0.3) #short delay before replying self.send_response(200) @@ -669,7 +677,7 @@ class ServerRequestHandler(http.server.SimpleHTTPRequestHandler): self.wfile.write(json.dumps({"success": ("true" if ag else "false")}).encode()) print("\nGeneration Aborted") else: - self.wfile.write(json.dumps({"success": "false"}).encode()) + self.wfile.write(json.dumps({"success": "false"}).encode()) return if self.path.endswith('/api/extra/generate/check'):