From 1c834fcbd3deb0913154b5702e58fe802513c79b Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Sat, 4 Apr 2026 13:36:19 +0800
Subject: [PATCH] try to match template more closely (+2 squashed commit)

Squashed commit:

[466808010] try to match template more closely

[9f805e753] try to match template more closely
---
 koboldcpp.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/koboldcpp.py b/koboldcpp.py
index 9814a30d3..3e6154c7b 100755
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -71,7 +71,7 @@ dry_seq_break_max = 128
 extra_images_max = 4 # for kontext/qwen img
 
 # global vars
-KcppVersion = "1.111"
+KcppVersion = "1.111.1"
 showdebug = True
 kcpp_instance = None #global running instance
 global_memory = {"tunnel_url": "", "restart_target":"", "input_to_exit":False, "load_complete":False, "restart_override_config_target":"", "last_active_timestamp":datetime.now(), "triggered_sleeping":False, "current_model":"initial_model", "swapReqType": None, "autoswapmode": False}
@@ -3885,6 +3885,10 @@ ws ::= | " " | "\n" [ \t]{0,20}
                 memory = memory.replace("{{[OUTPUT_END]}}", assistant_message_end)
                 memory = memory.replace("{{[SYSTEM_END]}}", system_message_end)
             else:
+                if "{{[INPUT]}}" in memory:
+                    memory = memory.replace("{{[INPUT]}}", user_message_start, 1)
+                else:
+                    prompt = prompt.replace("{{[INPUT]}}", user_message_start, 1)
                 prompt = prompt.replace("{{[INPUT]}}", assistant_message_end + user_message_start)
                 prompt = prompt.replace("{{[OUTPUT]}}", user_message_end + assistant_message_start)
                 prompt = prompt.replace("{{[SYSTEM]}}", system_message_start)