diff --git a/aiserver.py b/aiserver.py index ad2c5483..80ccd1d7 100644 --- a/aiserver.py +++ b/aiserver.py @@ -4410,7 +4410,7 @@ def get_message(msg): emit('from_server', {'cmd': 'wiupdate', 'num': msg['num'], 'data': {field: koboldai_vars.worldinfo[num][field] for field in fields}}, broadcast=True, room="UI_1") elif(msg['cmd'] == 'wifolderupdate'): setgamesaved(False) - uid = int(msg['uid']) + uid = str(msg['uid']) fields = ("name", "collapsed") for field in fields: if(field in msg['data'] and type(msg['data'][field]) is (str if field != "collapsed" else bool)): @@ -6760,7 +6760,7 @@ def addwiitem(folder_uid=None): ob = {"key": "", "keysecondary": "", "content": "", "comment": "", "folder": folder_uid, "num": len(koboldai_vars.worldinfo), "init": False, "selective": False, "constant": False} koboldai_vars.worldinfo.append(ob) while(True): - uid = int.from_bytes(os.urandom(4), "little", signed=True) + uid = str(int.from_bytes(os.urandom(4), "little", signed=True)) if(uid not in koboldai_vars.worldinfo_u): break koboldai_vars.worldinfo_u[uid] = koboldai_vars.worldinfo[-1] @@ -6774,7 +6774,7 @@ def addwiitem(folder_uid=None): #==================================================================# def addwifolder(): while(True): - uid = int.from_bytes(os.urandom(4), "little", signed=True) + uid = str(int.from_bytes(os.urandom(4), "little", signed=True)) if(uid not in koboldai_vars.wifolders_d): break ob = {"name": "", "collapsed": False} @@ -6843,7 +6843,7 @@ def sendwi(): last_folder = ... for wi in koboldai_vars.worldinfo: if(wi["folder"] != last_folder): - emit('from_server', {'cmd': 'addwifolder', 'uid': wi["folder"], 'data': koboldai_vars.wifolders_d[wi["folder"]] if wi["folder"] is not None else None}, broadcast=True, room="UI_1") + emit('from_server', {'cmd': 'addwifolder', 'uid': wi["folder"], 'data': koboldai_vars.wifolders_d[str(wi["folder"])] if wi["folder"] is not None else None}, broadcast=True, room="UI_1") last_folder = wi["folder"] ob = wi emit('from_server', {'cmd': 'addwiitem', 'data': ob}, broadcast=True, room="UI_1") @@ -6886,7 +6886,7 @@ def stablesortwi(): #==================================================================# def commitwi(ar): for ob in ar: - ob["uid"] = int(ob["uid"]) + ob["uid"] = str(ob["uid"]) koboldai_vars.worldinfo_u[ob["uid"]]["key"] = ob["key"] koboldai_vars.worldinfo_u[ob["uid"]]["keysecondary"] = ob["keysecondary"] koboldai_vars.worldinfo_u[ob["uid"]]["content"] = ob["content"] @@ -6926,7 +6926,7 @@ def deletewi(uid): # #==================================================================# def deletewifolder(uid): - uid = int(uid) + uid = str(uid) del koboldai_vars.wifolders_u[uid] del koboldai_vars.wifolders_d[uid] del koboldai_vars.wifolders_l[koboldai_vars.wifolders_l.index(uid)] diff --git a/koboldai_settings.py b/koboldai_settings.py index 18fe2d1f..e921b307 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -1002,7 +1002,7 @@ class story_settings(settings): new_world_info.add_item([x.strip() for x in wi["key"].split(",")][0], wi["key"], wi.get("keysecondary", ""), - "root" if wi["folder"] is None else self.wifolders_d[wi['folder']]['name'], + "root" if wi["folder"] is None else self.wifolders_d[str(wi['folder'])]['name'], wi.get("constant", False), wi["content"], wi.get("comment", ""),