From fb0f06c7a2e4bc13a143a1fe74fd2d9c7df05333 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 5 Feb 2023 06:23:20 +0300 Subject: [PATCH 01/12] RTE (Custom) --- presets/Custom.presets | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/presets/Custom.presets b/presets/Custom.presets index 1c710b30..eb089cab 100644 --- a/presets/Custom.presets +++ b/presets/Custom.presets @@ -17,13 +17,13 @@ "rep_pen_range": 1024, "rep_pen_slope": 0.7, "sampler_order": [ - 6, 5, 4, 3, 2, 1, - 0 + 0, + 6 ] }, { @@ -44,13 +44,13 @@ "rep_pen_range": 1024, "rep_pen_slope": 0.7, "sampler_order": [ - 6, 5, 4, 3, 1, 2, - 0 + 0, + 6 ] }, { @@ -71,13 +71,13 @@ "rep_pen_range": 1024, "rep_pen_slope": 0.7, "sampler_order": [ - 6, 0, 1, 2, 3, 4, - 5 + 5, + 6 ] }, { @@ -98,13 +98,13 @@ "rep_pen_range": 1024, "rep_pen_slope": 0.7, "sampler_order": [ - 6, 0, 1, 2, 3, 4, - 5 + 5, + 6 ] }, { @@ -125,13 +125,13 @@ "rep_pen_range": 1024, "rep_pen_slope": 0.7, "sampler_order": [ - 6, 0, 1, 2, 3, 4, - 5 + 5, + 6 ] }, { @@ -152,13 +152,13 @@ "rep_pen_range": 1024, "rep_pen_slope": 0.7, "sampler_order": [ - 6, 4, 5, 1, 0, 2, - 3 + 3, + 6 ] } -] \ No newline at end of file +] From 2f98885e723a3f673f2b08f2824991142465a07b Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 5 Feb 2023 06:24:34 +0300 Subject: [PATCH 02/12] RTE (13B) --- presets/Official_13B.presets | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/presets/Official_13B.presets b/presets/Official_13B.presets index c2d49149..994f7abd 100644 --- a/presets/Official_13B.presets +++ b/presets/Official_13B.presets @@ -17,13 +17,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.1, "sampler_order": [ - 6, 2, 0, 3, 5, 1, - 4 + 4, + 6 ] }, { @@ -44,13 +44,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.3, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -71,13 +71,13 @@ "rep_pen_range": 404, "rep_pen_slope": 0.8, "sampler_order": [ - 6, 0, 5, 3, 2, 1, - 4 + 4, + 6 ] }, { @@ -98,13 +98,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 7, "sampler_order": [ - 6, 3, 2, 0, 5, 1, - 4 + 4, + 6 ] }, { @@ -125,13 +125,13 @@ "rep_pen_range": 0, "rep_pen_slope": 0.0, "sampler_order": [ - 6, 0, 4, 1, 3, 5, - 2 + 2, + 6 ] }, { @@ -152,13 +152,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.1, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -179,13 +179,13 @@ "rep_pen_range": 400, "rep_pen_slope": 0.3, "sampler_order": [ - 6, 5, 0, 3, 2, 1, - 4 + 4, + 6 ] }, { @@ -206,13 +206,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.2, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -233,13 +233,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.0, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -260,13 +260,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.1, "sampler_order": [ - 6, 3, 2, 5, 0, 1, - 4 + 4, + 6 ] } -] \ No newline at end of file +] From b6ac432e2327269dc74d00bf7131150542d5fb63 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 5 Feb 2023 06:26:03 +0300 Subject: [PATCH 03/12] RTE (6B) --- presets/Official_6B.presets | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/presets/Official_6B.presets b/presets/Official_6B.presets index 523f3308..6fcf1a33 100644 --- a/presets/Official_6B.presets +++ b/presets/Official_6B.presets @@ -8,13 +8,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.2, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ], "temp": 0.72, "tfs": 1.0, @@ -35,13 +35,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.0, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ], "temp": 0.51, "tfs": 0.99, @@ -71,13 +71,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.0, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -98,13 +98,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.0, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -125,13 +125,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 0.0, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -152,13 +152,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 3.4, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] }, { @@ -179,13 +179,13 @@ "rep_pen_range": 2048, "rep_pen_slope": 6.8, "sampler_order": [ - 6, 5, 0, 2, 3, 1, - 4 + 4, + 6 ] } -] \ No newline at end of file +] From 0e06fc371f4e4cba944685c48bb13f5f509eb650 Mon Sep 17 00:00:00 2001 From: Henk Date: Mon, 27 Feb 2023 17:46:33 +0100 Subject: [PATCH 04/12] Modeldir Fix --- docker-standalone/docker-helper.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-standalone/docker-helper.sh b/docker-standalone/docker-helper.sh index 30107e8a..2a618cbb 100755 --- a/docker-standalone/docker-helper.sh +++ b/docker-standalone/docker-helper.sh @@ -9,7 +9,7 @@ if [[ ! -v KOBOLDAI_DATADIR ]];then fi mkdir $KOBOLDAI_DATADIR/stories -if [[ ! -v KOBOLDAI_MODELDIR ]];then +if [[ -v KOBOLDAI_MODELDIR ]];then mkdir $KOBOLDAI_MODELDIR/models fi mkdir $KOBOLDAI_DATADIR/settings @@ -28,7 +28,7 @@ rm -rf userscripts/ rm softprompts rm -rf softprompts/ -if [[ ! -v KOBOLDAI_MODELDIR ]];then +if [[ -v KOBOLDAI_MODELDIR ]];then rm models rm -rf models/ #rm cache @@ -39,7 +39,7 @@ ln -s $KOBOLDAI_DATADIR/stories/ stories ln -s $KOBOLDAI_DATADIR/settings/ settings ln -s $KOBOLDAI_DATADIR/softprompts/ softprompts ln -s $KOBOLDAI_DATADIR/userscripts/ userscripts -if [[ ! -v KOBOLDAI_MODELDIR ]];then +if [[ -v KOBOLDAI_MODELDIR ]];then ln -s $KOBOLDAI_MODELDIR/models/ models #ln -s $KOBOLDAI_MODELDIR/cache/ cache fi From 0ba7ac96d36d02d9b6cf688695356be6f7cbe172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Benda?= Date: Thu, 2 Mar 2023 00:04:17 +0100 Subject: [PATCH 05/12] Created SinglelineStopper, which interrupts token generation when a newline is reached if singleline mode is enabled --- aiserver.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/aiserver.py b/aiserver.py index b845330e..91543514 100644 --- a/aiserver.py +++ b/aiserver.py @@ -2452,6 +2452,29 @@ def patch_transformers(): return True return False + class SinglelineStopper(StoppingCriteria): + # If singleline mode is enabled, it's pointless to generate output beyond the first newline. + def __init__(self, tokenizer): + self.tokenizer = tokenizer + + def __call__( + self, + input_ids: torch.LongTensor, + scores: torch.FloatTensor, + **kwargs, + ) -> bool: + if not koboldai_vars.singleline: + return False + + data = [tokenizer.decode(x) for x in input_ids] + if 'completed' not in self.__dict__: + self.completed = [False]*len(input_ids) + + for i in range(len(input_ids)): + if (re.compile(r'\n').search(data[i][-1 * (len(koboldai_vars.chatname) + 1):]) is not None): + self.completed[i] = True + + return self.completed[i] class CoreStopper(StoppingCriteria): # Controls core generation stuff; aborting, counting generated tokens, etc @@ -2560,6 +2583,7 @@ def patch_transformers(): token_streamer = TokenStreamer(tokenizer=tokenizer) stopping_criteria.insert(0, ChatModeStopper(tokenizer=tokenizer)) + stopping_criteria.insert(0, SinglelineStopper(tokenizer=tokenizer)) stopping_criteria.insert(0, self.kai_scanner) token_streamer = TokenStreamer(tokenizer=tokenizer) stopping_criteria.insert(0, token_streamer) From aa124b65dbb7aea858ecd85e922f4d8134d98000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Benda?= Date: Thu, 2 Mar 2023 08:22:31 +0100 Subject: [PATCH 06/12] Fix: incorrect newline evaluation --- aiserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiserver.py b/aiserver.py index 91543514..8ee83707 100644 --- a/aiserver.py +++ b/aiserver.py @@ -2471,7 +2471,7 @@ def patch_transformers(): self.completed = [False]*len(input_ids) for i in range(len(input_ids)): - if (re.compile(r'\n').search(data[i][-1 * (len(koboldai_vars.chatname) + 1):]) is not None): + if data[i][-1] == "\n": self.completed[i] = True return self.completed[i] From f03b538cabb310c82b9402eeef386b824fc92e09 Mon Sep 17 00:00:00 2001 From: Henk Date: Thu, 2 Mar 2023 17:43:23 +0100 Subject: [PATCH 07/12] Remote no longer unblocks the port by default --- aiserver.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aiserver.py b/aiserver.py index b845330e..14ebc2eb 100644 --- a/aiserver.py +++ b/aiserver.py @@ -1604,6 +1604,7 @@ def general_startup(override_args=None): if args.host: koboldai_vars.host = True; + args.unblock = True; if args.cpu: koboldai_vars.use_colab_tpu = False @@ -13278,7 +13279,10 @@ def run(): logger.init_ok("Webserver", status="OK") logger.message(f"Webserver has started, you can now connect to this machine at port: {port}") koboldai_vars.serverstarted = True - socketio.run(app, host='0.0.0.0', port=port) + if args.unblock: + socketio.run(app, port=port, host='0.0.0.0') + else: + socketio.run(app, port=port) else: startup() if args.unblock: From 59e1f74f7c28ce7b0a2353c10d1448ab75993b18 Mon Sep 17 00:00:00 2001 From: Henk Date: Sat, 4 Mar 2023 14:17:47 +0100 Subject: [PATCH 08/12] Enable BMS API again under a new name --- aiserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiserver.py b/aiserver.py index d22c770c..bfcc0b21 100644 --- a/aiserver.py +++ b/aiserver.py @@ -320,8 +320,8 @@ model_menu = { ["GooseAI API (requires API key)", "GooseAI", "None", False], ["OpenAI API (requires API key)", "OAI", "None", False], ["InferKit API (requires API key)", "InferKit", "None", False], - # ["KoboldAI Server API (Old Google Colab)", "Colab", "", False], ["KoboldAI API", "API", "None", False], + ["Basic Model API", "Colab", "", False], ["KoboldAI Horde", "CLUSTER", "None", False], ["Return to Main Menu", "mainmenu", "", True], ] From 1c891181e98887d61bedd532f84ebbb4798ada92 Mon Sep 17 00:00:00 2001 From: Henk Date: Sat, 4 Mar 2023 18:27:02 +0100 Subject: [PATCH 09/12] Remove old worker API --- KoboldAI-Horde-Bridge | 2 +- koboldai_settings.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/KoboldAI-Horde-Bridge b/KoboldAI-Horde-Bridge index df6c3d2c..7a732780 160000 --- a/KoboldAI-Horde-Bridge +++ b/KoboldAI-Horde-Bridge @@ -1 +1 @@ -Subproject commit df6c3d2c3564571f30916aac4031b7b4bcf938b0 +Subproject commit 7a7327804ff10182adf8cda48e97784958699a49 diff --git a/koboldai_settings.py b/koboldai_settings.py index bb36bb85..d99ee2e6 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -1354,29 +1354,23 @@ class system_settings(settings): try: bridge_cd = importlib.import_module("KoboldAI-Horde-Bridge.clientData") cluster_url = bridge_cd.cluster_url - old_api_url = bridge_cd.old_api_url - serve_old_api = bridge_cd.serve_old_api kai_name = bridge_cd.kai_name if kai_name == "My Awesome Instance": kai_name = f"KoboldAI UI Instance #{random.randint(-100000000, 100000000)}" api_key = bridge_cd.api_key - old_api_key = bridge_cd.old_api_key priority_usernames = bridge_cd.priority_usernames except: cluster_url = "https://horde.koboldai.net" - old_api_url = "https://koboldai.net" - serve_old_api = True kai_name = self._koboldai_var.horde_worker_name if kai_name == "My Awesome Instance": kai_name = f"KoboldAI UI Instance #{random.randint(-100000000, 100000000)}" api_key = self._koboldai_var.horde_api_key - old_api_key = "0000000000" priority_usernames = [] # Always use the local URL & port kai_url = f'http://127.0.0.1:{self.port}' logger.info(f"Name: {kai_name} on {kai_url}") - threading.Thread(target=self._horde_pid.bridge, args=(1, api_key, kai_name, kai_url, cluster_url, priority_usernames, serve_old_api, old_api_url, old_api_key)).run() + threading.Thread(target=self._horde_pid.bridge, args=(1, api_key, kai_name, kai_url, cluster_url, priority_usernames)).run() else: if self._horde_pid is not None: logger.info("Killing Horde bridge") From 4f17bf0c87da52de78fe844276428809b6f527b3 Mon Sep 17 00:00:00 2001 From: jojorne Date: Sun, 5 Mar 2023 13:22:33 -0300 Subject: [PATCH 10/12] Access WI uid keys with str. --- aiserver.py | 12 ++++++------ koboldai_settings.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aiserver.py b/aiserver.py index bfcc0b21..5efa5999 100644 --- a/aiserver.py +++ b/aiserver.py @@ -4411,7 +4411,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)): @@ -6761,7 +6761,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] @@ -6775,7 +6775,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} @@ -6844,7 +6844,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") @@ -6887,7 +6887,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"] @@ -6927,7 +6927,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 d99ee2e6..9e21808c 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", ""), From b7f30a41c51864d75d172ff429cc7157588c32eb Mon Sep 17 00:00:00 2001 From: Henk Date: Mon, 6 Mar 2023 19:32:28 +0100 Subject: [PATCH 11/12] LLama tokenizer workaround --- aiserver.py | 5 +++-- koboldai_settings.py | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aiserver.py b/aiserver.py index bfcc0b21..6a44c8d5 100644 --- a/aiserver.py +++ b/aiserver.py @@ -3180,9 +3180,10 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal shutil.move(os.path.realpath(huggingface_hub.hf_hub_download(koboldai_vars.model, filename, revision=koboldai_vars.revision, cache_dir="cache", local_files_only=True, legacy_cache_layout=legacy)), os.path.join("models/{}".format(koboldai_vars.model.replace('/', '_')), filename)) shutil.rmtree("cache/") - if(koboldai_vars.badwordsids is koboldai_settings.badwordsids_default and koboldai_vars.model_type not in ("gpt2", "gpt_neo", "gptj")): + if(koboldai_vars.badwordsids is koboldai_settings.badwordsids_default and koboldai_vars.model_type not in ("gpt2", "gpt_neo", "gptj", "llama")): koboldai_vars.badwordsids = [[v] for k, v in tokenizer.get_vocab().items() if any(c in str(k) for c in "<>[]") if koboldai_vars.newlinemode != "s" or str(k) != ""] - + if(koboldai_vars.badwordsids is koboldai_settings.badwordsids_default and koboldai_vars.model_type == "llama"): + koboldai_vars.badwordsids = koboldai_settings.badwordsids_llama patch_causallm(model) if(koboldai_vars.hascuda): diff --git a/koboldai_settings.py b/koboldai_settings.py index d99ee2e6..c8073856 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -2739,5 +2739,4 @@ default_preset = { } badwordsids_default = [[6880], [50256], [42496], [4613], [17414], [22039], [16410], [27], [29], [38430], [37922], [15913], [24618], [28725], [58], [47175], [36937], [26700], [12878], [16471], [37981], [5218], [29795], [13412], [45160], [3693], [49778], [4211], [20598], [36475], [33409], [44167], [32406], [29847], [29342], [42669], [685], [25787], [7359], [3784], [5320], [33994], [33490], [34516], [43734], [17635], [24293], [9959], [23785], [21737], [28401], [18161], [26358], [32509], [1279], [38155], [18189], [26894], [6927], [14610], [23834], [11037], [14631], [26933], [46904], [22330], [25915], [47934], [38214], [1875], [14692], [41832], [13163], [25970], [29565], [44926], [19841], [37250], [49029], [9609], [44438], [16791], [17816], [30109], [41888], [47527], [42924], [23984], [49074], [33717], [31161], [49082], [30138], [31175], [12240], [14804], [7131], [26076], [33250], [3556], [38381], [36338], [32756], [46581], [17912], [49146]] # Tokenized array of badwords used to prevent AI artifacting badwordsids_neox = [[0], [1], [44162], [9502], [12520], [31841], [36320], [49824], [34417], [6038], [34494], [24815], [26635], [24345], [3455], [28905], [44270], [17278], [32666], [46880], [7086], [43189], [37322], [17778], [20879], [49821], [3138], [14490], [4681], [21391], [26786], [43134], [9336], [683], [48074], [41256], [19181], [29650], [28532], [36487], [45114], [46275], [16445], [15104], [11337], [1168], [5647], [29], [27482], [44965], [43782], [31011], [42944], [47389], [6334], [17548], [38329], [32044], [35487], [2239], [34761], [7444], [1084], [12399], [18990], [17636], [39083], [1184], [35830], [28365], [16731], [43467], [47744], [1138], [16079], [40116], [45564], [18297], [42368], [5456], [18022], [42696], [34476], [23505], [23741], [39334], [37944], [45382], [38709], [33440], [26077], [43600], [34418], [36033], [6660], [48167], [48471], [15775], [19884], [41533], [1008], [31053], [36692], [46576], [20095], [20629], [31759], [46410], [41000], [13488], [30952], [39258], [16160], [27655], [22367], [42767], [43736], [49694], [13811], [12004], [46768], [6257], [37471], [5264], [44153], [33805], [20977], [21083], [25416], [14277], [31096], [42041], [18331], [33376], [22372], [46294], [28379], [38475], [1656], [5204], [27075], [50001], [16616], [11396], [7748], [48744], [35402], [28120], [41512], [4207], [43144], [14767], [15640], [16595], [41305], [44479], [38958], [18474], [22734], [30522], [46267], [60], [13976], [31830], [48701], [39822], [9014], [21966], [31422], [28052], [34607], [2479], [3851], [32214], [44082], [45507], [3001], [34368], [34758], [13380], [38363], [4299], [46802], [30996], [12630], [49236], [7082], [8795], [5218], [44740], [9686], [9983], [45301], [27114], [40125], [1570], [26997], [544], [5290], [49193], [23781], [14193], [40000], [2947], [43781], [9102], [48064], [42274], [18772], [49384], [9884], [45635], [43521], [31258], [32056], [47686], [21760], [13143], [10148], [26119], [44308], [31379], [36399], [23983], [46694], [36134], [8562], [12977], [35117], [28591], [49021], [47093], [28653], [29013], [46468], [8605], [7254], [25896], [5032], [8168], [36893], [38270], [20499], [27501], [34419], [29547], [28571], [36586], [20871], [30537], [26842], [21375], [31148], [27618], [33094], [3291], [31789], [28391], [870], [9793], [41361], [47916], [27468], [43856], [8850], [35237], [15707], [47552], [2730], [41449], [45488], [3073], [49806], [21938], [24430], [22747], [20924], [46145], [20481], [20197], [8239], [28231], [17987], [42804], [47269], [29972], [49884], [21382], [46295], [36676], [34616], [3921], [26991], [27720], [46265], [654], [9855], [40354], [5291], [34904], [44342], [2470], [14598], [880], [19282], [2498], [24237], [21431], [16369], [8994], [44524], [45662], [13663], [37077], [1447], [37786], [30863], [42854], [1019], [20322], [4398], [12159], [44072], [48664], [31547], [18736], [9259], [31], [16354], [21810], [4357], [37982], [5064], [2033], [32871], [47446], [62], [22158], [37387], [8743], [47007], [17981], [11049], [4622], [37916], [36786], [35138], [29925], [14157], [18095], [27829], [1181], [22226], [5709], [4725], [30189], [37014], [1254], [11380], [42989], [696], [24576], [39487], [30119], [1092], [8088], [2194], [9899], [14412], [21828], [3725], [13544], [5180], [44679], [34398], [3891], [28739], [14219], [37594], [49550], [11326], [6904], [17266], [5749], [10174], [23405], [9955], [38271], [41018], [13011], [48392], [36784], [24254], [21687], [23734], [5413], [41447], [45472], [10122], [17555], [15830], [47384], [12084], [31350], [47940], [11661], [27988], [45443], [905], [49651], [16614], [34993], [6781], [30803], [35869], [8001], [41604], [28118], [46462], [46762], [16262], [17281], [5774], [10943], [5013], [18257], [6750], [4713], [3951], [11899], [38791], [16943], [37596], [9318], [18413], [40473], [13208], [16375]] -badwordsids_opt = [[44717], [46613], [48513], [49923], [50185], [48755], [8488], [43303], [49659], [48601], [49817], [45405], [48742], [49925], [47720], [11227], [48937], [48784], [50017], [42248], [49310], [48082], [49895], [50025], [49092], [49007], [8061], [44226], [0], [742], [28578], [15698], [49784], [46679], [39365], [49281], [49609], [48081], [48906], [46161], [48554], [49670], [48677], [49721], [49632], [48610], [48462], [47457], [10975], [46077], [28696], [48709], [43839], [49798], [49154], [48203], [49625], [48395], [50155], [47161], [49095], [48833], [49420], [49666], [48443], [22176], [49242], [48651], [49138], [49750], [40389], [48021], [21838], [49070], [45333], [40862], [1], [49915], [33525], [49858], [50254], [44403], [48992], [48872], [46117], [49853], [47567], [50206], [41552], [50068], [48999], [49703], [49940], [49329], [47620], [49868], [49962], [2], [44082], [50236], [31274], [50260], [47052], [42645], [49177], [17523], [48691], [49900], [49069], [49358], [48794], [47529], [46479], [48457], [646], [49910], [48077], [48935], [46386], [48902], [49151], [48759], [49803], [45587], [48392], [47789], [48654], [49836], [49230], [48188], [50264], [46844], [44690], [48505], [50161], [27779], [49995], [41833], [50154], [49097], [48520], [50018], [8174], [50084], [49366], [49526], [50193], [7479], [49982], [3]] - +badwordsids_llama = [[518], [529], [829], [850], [976], [1013], [1149], [1385], [1402], [1405], [1533], [1599], [1822], [1839], [2033], [2314], [2565], [2636], [2900], [3108], [3199], [3238], [3254], [3366], [3532], [3551], [3705], [3779], [3816], [4197], [4261], [4400], [4488], [4514], [4638], [4681], [5099], [5159], [5262], [5277], [5299], [5319], [5387], [5519], [5539], [5586], [5691], [5913], [5961], [6024], [6319], [6525], [6580], [6660], [6681], [6736], [6778], [6796], [7072], [7110], [7226], [7464], [7503], [7961], [8169], [8219], [8295], [8308], [8653], [8999], [9310], [9314], [9341], [9601], [9872], [10062], [10175], [10202], [10338], [10341], [10370], [10514], [10553], [10725], [10834], [10846], [11041], [11287], [11424], [11724], [11759], [11903], [11970], [12258], [12334], [12436], [12437], [12452], [12622], [12801], [12940], [12948], [13192], [13359], [13505], [13531], [13539], [13769], [13885], [13970], [14065], [14136], [14178], [14247], [14330], [14352], [14664], [14704], [14814], [14935], [15110], [15271], [15410], [15513], [15555], [15625], [15974], [16040], [16215], [16261], [16272], [16299], [16406], [16733], [16826], [16862], [16871], [16917], [17077], [17094], [17288], [17361], [17382], [17428], [17531], [17548], [18017], [18024], [18173], [18252], [18456], [18572], [18899], [18943], [18959], [19250], [19423], [19482], [19660], [19942], [19969], [19997], [20068], [20454], [20526], [20577], [20667], [20690], [20770], [20824], [20840], [21069], [21106], [21172], [21251], [21298], [21347], [21540], [21545], [21765], [21939], [21945], [22322], [22423], [22689], [22896], [23076], [23098], [23160], [23192], [23625], [23917], [24264], [24406], [24566], [24630], [24927], [24960], [25076], [25225], [25230], [25299], [25473], [25867], [25901], [26073], [26208], [26244], [26292], [26498], [26717], [26909], [27077], [27258], [27706], [27865], [28166], [28341], [28513], [28895], [28945], [29588], [29861], [29958], [29961], [29962], [29966]] From 099c818c06e7d609a23dccd5051d3976791e7324 Mon Sep 17 00:00:00 2001 From: Henk Date: Mon, 6 Mar 2023 20:56:15 +0100 Subject: [PATCH 12/12] Experimental unbanning of <> --- aiserver.py | 6 ++---- koboldai_settings.py | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/aiserver.py b/aiserver.py index 6a44c8d5..ad2c5483 100644 --- a/aiserver.py +++ b/aiserver.py @@ -3180,10 +3180,8 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal shutil.move(os.path.realpath(huggingface_hub.hf_hub_download(koboldai_vars.model, filename, revision=koboldai_vars.revision, cache_dir="cache", local_files_only=True, legacy_cache_layout=legacy)), os.path.join("models/{}".format(koboldai_vars.model.replace('/', '_')), filename)) shutil.rmtree("cache/") - if(koboldai_vars.badwordsids is koboldai_settings.badwordsids_default and koboldai_vars.model_type not in ("gpt2", "gpt_neo", "gptj", "llama")): - koboldai_vars.badwordsids = [[v] for k, v in tokenizer.get_vocab().items() if any(c in str(k) for c in "<>[]") if koboldai_vars.newlinemode != "s" or str(k) != ""] - if(koboldai_vars.badwordsids is koboldai_settings.badwordsids_default and koboldai_vars.model_type == "llama"): - koboldai_vars.badwordsids = koboldai_settings.badwordsids_llama + if(koboldai_vars.badwordsids is koboldai_settings.badwordsids_default and koboldai_vars.model_type not in ("gpt2", "gpt_neo", "gptj")): + koboldai_vars.badwordsids = [[v] for k, v in tokenizer.get_vocab().items() if any(c in str(k) for c in "[]")] patch_causallm(model) if(koboldai_vars.hascuda): diff --git a/koboldai_settings.py b/koboldai_settings.py index c8073856..18fe2d1f 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -2738,5 +2738,4 @@ default_preset = { ] } badwordsids_default = [[6880], [50256], [42496], [4613], [17414], [22039], [16410], [27], [29], [38430], [37922], [15913], [24618], [28725], [58], [47175], [36937], [26700], [12878], [16471], [37981], [5218], [29795], [13412], [45160], [3693], [49778], [4211], [20598], [36475], [33409], [44167], [32406], [29847], [29342], [42669], [685], [25787], [7359], [3784], [5320], [33994], [33490], [34516], [43734], [17635], [24293], [9959], [23785], [21737], [28401], [18161], [26358], [32509], [1279], [38155], [18189], [26894], [6927], [14610], [23834], [11037], [14631], [26933], [46904], [22330], [25915], [47934], [38214], [1875], [14692], [41832], [13163], [25970], [29565], [44926], [19841], [37250], [49029], [9609], [44438], [16791], [17816], [30109], [41888], [47527], [42924], [23984], [49074], [33717], [31161], [49082], [30138], [31175], [12240], [14804], [7131], [26076], [33250], [3556], [38381], [36338], [32756], [46581], [17912], [49146]] # Tokenized array of badwords used to prevent AI artifacting -badwordsids_neox = [[0], [1], [44162], [9502], [12520], [31841], [36320], [49824], [34417], [6038], [34494], [24815], [26635], [24345], [3455], [28905], [44270], [17278], [32666], [46880], [7086], [43189], [37322], [17778], [20879], [49821], [3138], [14490], [4681], [21391], [26786], [43134], [9336], [683], [48074], [41256], [19181], [29650], [28532], [36487], [45114], [46275], [16445], [15104], [11337], [1168], [5647], [29], [27482], [44965], [43782], [31011], [42944], [47389], [6334], [17548], [38329], [32044], [35487], [2239], [34761], [7444], [1084], [12399], [18990], [17636], [39083], [1184], [35830], [28365], [16731], [43467], [47744], [1138], [16079], [40116], [45564], [18297], [42368], [5456], [18022], [42696], [34476], [23505], [23741], [39334], [37944], [45382], [38709], [33440], [26077], [43600], [34418], [36033], [6660], [48167], [48471], [15775], [19884], [41533], [1008], [31053], [36692], [46576], [20095], [20629], [31759], [46410], [41000], [13488], [30952], [39258], [16160], [27655], [22367], [42767], [43736], [49694], [13811], [12004], [46768], [6257], [37471], [5264], [44153], [33805], [20977], [21083], [25416], [14277], [31096], [42041], [18331], [33376], [22372], [46294], [28379], [38475], [1656], [5204], [27075], [50001], [16616], [11396], [7748], [48744], [35402], [28120], [41512], [4207], [43144], [14767], [15640], [16595], [41305], [44479], [38958], [18474], [22734], [30522], [46267], [60], [13976], [31830], [48701], [39822], [9014], [21966], [31422], [28052], [34607], [2479], [3851], [32214], [44082], [45507], [3001], [34368], [34758], [13380], [38363], [4299], [46802], [30996], [12630], [49236], [7082], [8795], [5218], [44740], [9686], [9983], [45301], [27114], [40125], [1570], [26997], [544], [5290], [49193], [23781], [14193], [40000], [2947], [43781], [9102], [48064], [42274], [18772], [49384], [9884], [45635], [43521], [31258], [32056], [47686], [21760], [13143], [10148], [26119], [44308], [31379], [36399], [23983], [46694], [36134], [8562], [12977], [35117], [28591], [49021], [47093], [28653], [29013], [46468], [8605], [7254], [25896], [5032], [8168], [36893], [38270], [20499], [27501], [34419], [29547], [28571], [36586], [20871], [30537], [26842], [21375], [31148], [27618], [33094], [3291], [31789], [28391], [870], [9793], [41361], [47916], [27468], [43856], [8850], [35237], [15707], [47552], [2730], [41449], [45488], [3073], [49806], [21938], [24430], [22747], [20924], [46145], [20481], [20197], [8239], [28231], [17987], [42804], [47269], [29972], [49884], [21382], [46295], [36676], [34616], [3921], [26991], [27720], [46265], [654], [9855], [40354], [5291], [34904], [44342], [2470], [14598], [880], [19282], [2498], [24237], [21431], [16369], [8994], [44524], [45662], [13663], [37077], [1447], [37786], [30863], [42854], [1019], [20322], [4398], [12159], [44072], [48664], [31547], [18736], [9259], [31], [16354], [21810], [4357], [37982], [5064], [2033], [32871], [47446], [62], [22158], [37387], [8743], [47007], [17981], [11049], [4622], [37916], [36786], [35138], [29925], [14157], [18095], [27829], [1181], [22226], [5709], [4725], [30189], [37014], [1254], [11380], [42989], [696], [24576], [39487], [30119], [1092], [8088], [2194], [9899], [14412], [21828], [3725], [13544], [5180], [44679], [34398], [3891], [28739], [14219], [37594], [49550], [11326], [6904], [17266], [5749], [10174], [23405], [9955], [38271], [41018], [13011], [48392], [36784], [24254], [21687], [23734], [5413], [41447], [45472], [10122], [17555], [15830], [47384], [12084], [31350], [47940], [11661], [27988], [45443], [905], [49651], [16614], [34993], [6781], [30803], [35869], [8001], [41604], [28118], [46462], [46762], [16262], [17281], [5774], [10943], [5013], [18257], [6750], [4713], [3951], [11899], [38791], [16943], [37596], [9318], [18413], [40473], [13208], [16375]] -badwordsids_llama = [[518], [529], [829], [850], [976], [1013], [1149], [1385], [1402], [1405], [1533], [1599], [1822], [1839], [2033], [2314], [2565], [2636], [2900], [3108], [3199], [3238], [3254], [3366], [3532], [3551], [3705], [3779], [3816], [4197], [4261], [4400], [4488], [4514], [4638], [4681], [5099], [5159], [5262], [5277], [5299], [5319], [5387], [5519], [5539], [5586], [5691], [5913], [5961], [6024], [6319], [6525], [6580], [6660], [6681], [6736], [6778], [6796], [7072], [7110], [7226], [7464], [7503], [7961], [8169], [8219], [8295], [8308], [8653], [8999], [9310], [9314], [9341], [9601], [9872], [10062], [10175], [10202], [10338], [10341], [10370], [10514], [10553], [10725], [10834], [10846], [11041], [11287], [11424], [11724], [11759], [11903], [11970], [12258], [12334], [12436], [12437], [12452], [12622], [12801], [12940], [12948], [13192], [13359], [13505], [13531], [13539], [13769], [13885], [13970], [14065], [14136], [14178], [14247], [14330], [14352], [14664], [14704], [14814], [14935], [15110], [15271], [15410], [15513], [15555], [15625], [15974], [16040], [16215], [16261], [16272], [16299], [16406], [16733], [16826], [16862], [16871], [16917], [17077], [17094], [17288], [17361], [17382], [17428], [17531], [17548], [18017], [18024], [18173], [18252], [18456], [18572], [18899], [18943], [18959], [19250], [19423], [19482], [19660], [19942], [19969], [19997], [20068], [20454], [20526], [20577], [20667], [20690], [20770], [20824], [20840], [21069], [21106], [21172], [21251], [21298], [21347], [21540], [21545], [21765], [21939], [21945], [22322], [22423], [22689], [22896], [23076], [23098], [23160], [23192], [23625], [23917], [24264], [24406], [24566], [24630], [24927], [24960], [25076], [25225], [25230], [25299], [25473], [25867], [25901], [26073], [26208], [26244], [26292], [26498], [26717], [26909], [27077], [27258], [27706], [27865], [28166], [28341], [28513], [28895], [28945], [29588], [29861], [29958], [29961], [29962], [29966]] +badwordsids_neox = [[0], [1], [44162], [9502], [12520], [31841], [36320], [49824], [34417], [6038], [34494], [24815], [26635], [24345], [3455], [28905], [44270], [17278], [32666], [46880], [7086], [43189], [37322], [17778], [20879], [49821], [3138], [14490], [4681], [21391], [26786], [43134], [9336], [683], [48074], [41256], [19181], [29650], [28532], [36487], [45114], [46275], [16445], [15104], [11337], [1168], [5647], [29], [27482], [44965], [43782], [31011], [42944], [47389], [6334], [17548], [38329], [32044], [35487], [2239], [34761], [7444], [1084], [12399], [18990], [17636], [39083], [1184], [35830], [28365], [16731], [43467], [47744], [1138], [16079], [40116], [45564], [18297], [42368], [5456], [18022], [42696], [34476], [23505], [23741], [39334], [37944], [45382], [38709], [33440], [26077], [43600], [34418], [36033], [6660], [48167], [48471], [15775], [19884], [41533], [1008], [31053], [36692], [46576], [20095], [20629], [31759], [46410], [41000], [13488], [30952], [39258], [16160], [27655], [22367], [42767], [43736], [49694], [13811], [12004], [46768], [6257], [37471], [5264], [44153], [33805], [20977], [21083], [25416], [14277], [31096], [42041], [18331], [33376], [22372], [46294], [28379], [38475], [1656], [5204], [27075], [50001], [16616], [11396], [7748], [48744], [35402], [28120], [41512], [4207], [43144], [14767], [15640], [16595], [41305], [44479], [38958], [18474], [22734], [30522], [46267], [60], [13976], [31830], [48701], [39822], [9014], [21966], [31422], [28052], [34607], [2479], [3851], [32214], [44082], [45507], [3001], [34368], [34758], [13380], [38363], [4299], [46802], [30996], [12630], [49236], [7082], [8795], [5218], [44740], [9686], [9983], [45301], [27114], [40125], [1570], [26997], [544], [5290], [49193], [23781], [14193], [40000], [2947], [43781], [9102], [48064], [42274], [18772], [49384], [9884], [45635], [43521], [31258], [32056], [47686], [21760], [13143], [10148], [26119], [44308], [31379], [36399], [23983], [46694], [36134], [8562], [12977], [35117], [28591], [49021], [47093], [28653], [29013], [46468], [8605], [7254], [25896], [5032], [8168], [36893], [38270], [20499], [27501], [34419], [29547], [28571], [36586], [20871], [30537], [26842], [21375], [31148], [27618], [33094], [3291], [31789], [28391], [870], [9793], [41361], [47916], [27468], [43856], [8850], [35237], [15707], [47552], [2730], [41449], [45488], [3073], [49806], [21938], [24430], [22747], [20924], [46145], [20481], [20197], [8239], [28231], [17987], [42804], [47269], [29972], [49884], [21382], [46295], [36676], [34616], [3921], [26991], [27720], [46265], [654], [9855], [40354], [5291], [34904], [44342], [2470], [14598], [880], [19282], [2498], [24237], [21431], [16369], [8994], [44524], [45662], [13663], [37077], [1447], [37786], [30863], [42854], [1019], [20322], [4398], [12159], [44072], [48664], [31547], [18736], [9259], [31], [16354], [21810], [4357], [37982], [5064], [2033], [32871], [47446], [62], [22158], [37387], [8743], [47007], [17981], [11049], [4622], [37916], [36786], [35138], [29925], [14157], [18095], [27829], [1181], [22226], [5709], [4725], [30189], [37014], [1254], [11380], [42989], [696], [24576], [39487], [30119], [1092], [8088], [2194], [9899], [14412], [21828], [3725], [13544], [5180], [44679], [34398], [3891], [28739], [14219], [37594], [49550], [11326], [6904], [17266], [5749], [10174], [23405], [9955], [38271], [41018], [13011], [48392], [36784], [24254], [21687], [23734], [5413], [41447], [45472], [10122], [17555], [15830], [47384], [12084], [31350], [47940], [11661], [27988], [45443], [905], [49651], [16614], [34993], [6781], [30803], [35869], [8001], [41604], [28118], [46462], [46762], [16262], [17281], [5774], [10943], [5013], [18257], [6750], [4713], [3951], [11899], [38791], [16943], [37596], [9318], [18413], [40473], [13208], [16375]] \ No newline at end of file