From: Tom Mittelstädt <1358-github@monster-box.de>
Date: Thu, 10 Jul 2025 08:31:18 +0000 (+0200)
Subject: clean gpt response for openai, too
X-Git-Tag: 3.13.0~48^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5540%2Fhead;p=thirdparty%2Frspamd.git

clean gpt response for openai, too
---

diff --git a/src/plugins/lua/gpt.lua b/src/plugins/lua/gpt.lua
index 5776791a10..331dbbce22 100644
--- a/src/plugins/lua/gpt.lua
+++ b/src/plugins/lua/gpt.lua
@@ -253,6 +253,15 @@ local function maybe_extract_json(str)
   return nil
 end
 
+-- Helper function to remove <think>...</think> and trim leading newlines
+local function clean_gpt_response(text)
+  -- Remove <think>...</think> including multiline
+  text = text:gsub("<think>.-</think>", "")
+  -- Trim leading whitespace and newlines
+  text = text:gsub("^%s*\n*", "")
+  return text
+end
+
 local function default_openai_json_conversion(task, input)
   local parser = ucl.parser()
   local res, err = parser:parse_string(input)
@@ -349,6 +358,10 @@ local function default_openai_plain_conversion(task, input)
     rspamd_logger.errx(task, 'no content in the first message')
     return
   end
+
+  -- Clean message
+  first_message = clean_gpt_response(first_message)
+
   local lines = lua_util.str_split(first_message, '\n')
   local first_line = clean_reply_line(lines[1])
   local spam_score = tonumber(first_line)
@@ -367,15 +380,6 @@ local function default_openai_plain_conversion(task, input)
   return
 end
 
--- Helper function to remove <think>...</think> and trim leading newlines
-local function clean_gpt_response(text)
-  -- Remove <think>...</think> including multiline
-  text = text:gsub("<think>.-</think>", "")
-  -- Trim leading whitespace and newlines
-  text = text:gsub("^%s*\n*", "")
-  return text
-end
-
 local function default_ollama_plain_conversion(task, input)
   local parser = ucl.parser()
   local res, err = parser:parse_string(input)