From 75dfad2bb00203e8ea3066955b9462e7d4017fa1 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Sat, 19 Apr 2025 23:04:29 +0800
Subject: [PATCH] fixed noscript (+1 squashed commits)
Squashed commits:
[dba28399] fixed noscript
---
koboldcpp.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/koboldcpp.py b/koboldcpp.py
index b2679f41d..61ce280e8 100644
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -2632,7 +2632,8 @@ class KcppServerRequestHandler(http.server.SimpleHTTPRequestHandler):
bodycontent += f'''Generated Image: {prompt if prompt else "None"}
{'
' if prompt else ""}
- (Be patient)'''
+
+ (Be patient)'''
elif chatmode:
oldconvo = prompt.strip().replace(f"{human_name}:",f"{human_name}:").replace(f"{bot_name}:",f"{bot_name}:").replace("\n","
")
oldconvo += f''''''
@@ -2643,11 +2644,13 @@ class KcppServerRequestHandler(http.server.SimpleHTTPRequestHandler):
bodycontent += f'''{newconvo if prompt=="" else oldconvo}
- (Be patient)'''
+
+ (Be patient)'''
else:
bodycontent += f'''
- (Be patient)
+
+ (Be patient)
'''
if not imgmode:
optionscontent = f'''
@@ -2660,6 +2663,7 @@ class KcppServerRequestHandler(http.server.SimpleHTTPRequestHandler):
optionscontent = f'''
'''
+ caps = get_capabilities()
finalhtml = f'''
@@ -2688,7 +2692,7 @@ Change Mode
-{imgbtn if "txt2img" in get_capabilities() else ""}
+{imgbtn if ("txt2img" in caps and caps["txt2img"]) else ""}
'''