From bff549deb6fad447a9708ba5725e961e38275fa8 Mon Sep 17 00:00:00 2001
From: Olivier Chafik <ochafik@google.com>
Date: Tue, 4 Feb 2025 00:14:48 +0000
Subject: [PATCH] simplify hack to fix original template's backfill from minja

---
 common/chat.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/chat.cpp b/common/chat.cpp
index ca9693655..2f114a24c 100644
--- a/common/chat.cpp
+++ b/common/chat.cpp
@@ -604,13 +604,10 @@ static common_chat_params common_chat_params_init_deepseek_r1(const common_chat_
             }
         }
         // Fix up tool call delta example added by Minja
-        std::string marker = "<｜tool▁call▁end｜>\n";
-        auto pos = prompt.rfind(marker);
-        if (pos != std::string::npos) {
-            prompt.insert(pos + marker.size() - 1, "<｜tool▁calls▁end｜>");
-        } else {
-            LOG_WRN("Failed to find expected broken tool call example marker in prompt\n");
-        }
+        prompt = std::regex_replace(
+            prompt,
+            std::regex("<｜tool▁call▁end｜>[\\s\\r\\n]*<｜User｜>"),
+            "<｜tool▁call▁end｜><｜tool▁calls▁end｜><｜User｜>");
     }
     data.prompt = prompt;
     data.format = COMMON_CHAT_FORMAT_DEEPSEEK_R1;