From 48dea34a7a4465dcac9a738d2c62ceca121ae33a Mon Sep 17 00:00:00 2001 From: BBC-Esq Date: Wed, 17 Jul 2024 13:33:22 -0400 Subject: [PATCH 1/3] fix typo and streamline a little --- koboldcpp.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/koboldcpp.py b/koboldcpp.py index 71762367145..1f7117fec76 100644 --- a/koboldcpp.py +++ b/koboldcpp.py @@ -2113,15 +2113,11 @@ def sliderUpdate(a,b,c): def makelabelentry(parent, text, var, row=0, width=50, padx=8, singleline=False, tooltip=""): - label = makelabel(parent, text, row,0,tooltip) - entry = ctk.CTkEntry(parent, width=width, textvariable=var) #you cannot set placeholder text for SHARED variables - if singleline: - entry.grid(row=row, column=0, padx=padx, stick="nw") - else: - entry.grid(row=row, column=1, padx=padx, stick="nw") + label = makelabel(parent, text, row, 0, tooltip) + entry = ctk.CTkEntry(parent, width=width, textvariable=var) + entry.grid(row=row, column=(0 if singleline else 1), padx=padx, sticky="nw") return entry, label - def makefileentry(parent, text, searchtext, var, row=0, width=200, filetypes=[], onchoosefile=None, singlerow=False, singlecol=True, tooltiptxt=""): label = makelabel(parent, text, row,0,tooltiptxt,columnspan=3) def getfilename(var, text): From bf17d9a5e6f71aad4610521eb0150f9332e5d738 Mon Sep 17 00:00:00 2001 From: BBC-Esq Date: Wed, 17 Jul 2024 13:35:44 -0400 Subject: [PATCH 2/3] streamline togglehorde --- koboldcpp.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/koboldcpp.py b/koboldcpp.py index 1f7117fec76..73bc79cebcd 100644 --- a/koboldcpp.py +++ b/koboldcpp.py @@ -2578,21 +2578,21 @@ def pickpremadetemplate(): horde_workername_entry, horde_workername_label = makelabelentry(horde_tab, "Horde Worker Name:",horde_workername_var, 24, 180,tooltip="Your worker's name to be displayed.") def togglehorde(a,b,c): - labels = [horde_name_label, horde_gen_label, horde_context_label, horde_apikey_label, horde_workername_label] - for idx, item in enumerate([horde_name_entry, horde_gen_entry, horde_context_entry, horde_apikey_entry, horde_workername_entry]): + horde_items = zip([horde_name_entry, horde_gen_entry, horde_context_entry, horde_apikey_entry, horde_workername_entry], + [horde_name_label, horde_gen_label, horde_context_label, horde_apikey_label, horde_workername_label]) + + for item, label in horde_items: if usehorde_var.get() == 1: item.grid() - labels[idx].grid() + label.grid() else: item.grid_remove() - labels[idx].grid_remove() - if usehorde_var.get()==1 and (horde_name_var.get()=="koboldcpp" or horde_name_var.get()=="") and model_var.get()!="": + label.grid_remove() + + if usehorde_var.get()==1 and not horde_name_var.get() and model_var.get(): basefile = os.path.basename(model_var.get()) horde_name_var.set(sanitize_string(os.path.splitext(basefile)[0])) - - makecheckbox(horde_tab, "Configure for Horde", usehorde_var, 19, command=togglehorde,tooltiptxt="Enable the embedded AI Horde worker.") - togglehorde(1,1,1) - + # Image Gen Tab images_tab = tabcontent["Image Gen"] From bef0bf4a38ccc1044fbf6c58e2ff9a1ea1419d4a Mon Sep 17 00:00:00 2001 From: BBC-Esq Date: Wed, 17 Jul 2024 13:38:00 -0400 Subject: [PATCH 3/3] oops --- koboldcpp.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/koboldcpp.py b/koboldcpp.py index 73bc79cebcd..60bd387c1f5 100644 --- a/koboldcpp.py +++ b/koboldcpp.py @@ -2592,6 +2592,9 @@ def togglehorde(a,b,c): if usehorde_var.get()==1 and not horde_name_var.get() and model_var.get(): basefile = os.path.basename(model_var.get()) horde_name_var.set(sanitize_string(os.path.splitext(basefile)[0])) + + makecheckbox(horde_tab, "Configure for Horde", usehorde_var, 19, command=togglehorde,tooltiptxt="Enable the embedded AI Horde worker.") + togglehorde(1,1,1) # Image Gen Tab