Skip to content

Streamline misc #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LostRuins merged 3 commits into from
Jul 18, 2024
Merged

Streamline misc #1007

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48dea34
fix typo and streamline a little
BBC-Esq Jul 17, 2024
bf17d9a
streamline togglehorde
BBC-Esq Jul 17, 2024
bef0bf4
oops
BBC-Esq Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions koboldcpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -2582,21 +2578,24 @@ 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()!="":
Copy link
Copy Markdown
Owner

@LostRuins LostRuins Jul 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove koboldcpp

Copy link
Copy Markdown
Owner

@LostRuins LostRuins Jul 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll merge and fix this separately

Copy link
Copy Markdown
Author

@BBC-Esq BBC-Esq Jul 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, accidental of course.

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"]
Expand Down