diff options
Diffstat (limited to 'src/plugins/lua')
| -rw-r--r-- | src/plugins/lua/gpt.lua | 16 | ||||
| -rw-r--r-- | src/plugins/lua/rbl.lua | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/plugins/lua/gpt.lua b/src/plugins/lua/gpt.lua index feccae73f..e4a77c6dd 100644 --- a/src/plugins/lua/gpt.lua +++ b/src/plugins/lua/gpt.lua @@ -48,6 +48,8 @@ gpt { allow_passthrough = false; # Check messages that are apparent ham (no action and negative score) allow_ham = false; + # default send response_format field { type = "json_object" } + include_response_format = true, } ]]) return @@ -393,7 +395,6 @@ local function default_llm_check(task) model = settings.model, max_tokens = settings.max_tokens, temperature = settings.temperature, - response_format = { type = "json_object" }, messages = { { role = 'system', @@ -418,6 +419,11 @@ local function default_llm_check(task) } } + -- Conditionally add response_format + if settings.include_response_format then + body.response_format = { type = "json_object" } + end + upstream = settings.upstreams:get_upstream_round_robin() local http_params = { url = settings.url, @@ -498,7 +504,6 @@ local function ollama_check(task) model = settings.model, max_tokens = settings.max_tokens, temperature = settings.temperature, - response_format = { type = "json_object" }, messages = { { role = 'system', @@ -523,6 +528,11 @@ local function ollama_check(task) } } + -- Conditionally add response_format + if settings.include_response_format then + body.response_format = { type = "json_object" } + end + upstream = settings.upstreams:get_upstream_round_robin() local http_params = { url = settings.url, @@ -618,4 +628,4 @@ if opts then parent = id, score = -2.0, }) -end
\ No newline at end of file +end diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index 76c84f85d..2c2fe0071 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -983,7 +983,7 @@ local function gen_rbl_callback(rule) if req.resolve_ip then -- Deal with both ipv4 and ipv6 -- Resolve names first - if r:resolve_a({ + if (rule.ipv4 == nil or rule.ipv4) and r:resolve_a({ task = task, name = req.n, callback = gen_rbl_ip_dns_callback(req), @@ -991,7 +991,7 @@ local function gen_rbl_callback(rule) }) then nresolved = nresolved + 1 end - if r:resolve('aaaa', { + if (rule.ipv6 == nil or rule.ipv6) and r:resolve('aaaa', { task = task, name = req.n, callback = gen_rbl_ip_dns_callback(req), |