Merge branch 'master' of https://github.com/lordgreg/kong

Author: lordgreg

.requirements

@@ -15,7 +15,7 @@ LIBEXPAT_SHA256=fd03b7172b3bd7427a3e7a812063f74754f24542429b634e0db6511b53fb2278
 
 # Note: git repositories can be loaded from local path if path is set as value
 
-LUA_KONG_NGINX_MODULE=cd41aaa260eb54ec8f4c55b755b62351853b20fb # 0.15.1
+LUA_KONG_NGINX_MODULE=3f305911823301a98a12ec6ecdd9070b8ebe499b # 0.18.0
 LUA_RESTY_LMDB=9da0e9f3313960d06e2d8e718b7ac494faa500f1 # 1.6.0
 LUA_RESTY_EVENTS=bc85295b7c23eda2dbf2b4acec35c93f77b26787 # 0.3.1
 LUA_RESTY_SIMDJSON=176755a45f128fd4b3069c1bdee24d14bfb6900a # 1.2.0

README.md

@@ -127,7 +127,7 @@ limitations under the License.
 
 [kong-url]: https://konghq.com/
 [kong-logo]: https://konghq.com/wp-content/uploads/2018/05/kong-logo-github-readme.png
-[kong-diagram]: https://assets.prd.mktg.konghq.com/images/2025/09/68cc1bfd-kong-diagram.png
+[kong-diagram]: https://assets.prd.mktg.konghq.com/images/2025/09/68cc1bfd-kong-diagram.png?v=2
 [kong-benefits]: https://konghq.com/wp-content/uploads/2018/05/kong-benefits-github-readme.png
 [kong-master-builds]: https://hub.docker.com/r/kong/kong/tags
 [badge-action-url]: https://github.com/Kong/kong/actions

build/openresty/patches/nginx-1.27.1_11-refresh-uri-when-proxy-pass-balancer-recreate.patch renamed to build/openresty/patches/nginx-1.27.1_10-refresh-uri-when-proxy-pass-balancer-recreate.patch

@@ -0,0 +1,4 @@
+message: >
+  **ai-proxy**: Fixed an issue where OpenAI chat completion's tool_choice was not converted to Anthropic's.
+type: bugfix
+scope: Plugin

build/openresty/patches/nginx-1.27.1_10-ssl-disable-h2-alpn.patch

@@ -128,6 +128,33 @@ local function to_tools(in_tools)
   return out_tools
 end
 
+local function to_tool_choice(openai_tool_choice)
+  -- See https://docs.anthropic.com/en/api/messages#body-tool-choice and
+  -- https://platform.openai.com/docs/api-reference/chat/create#chat-create-tool_choice
+  if type(openai_tool_choice) == "string" then
+    if openai_tool_choice == "required" then
+      return {type = "any"}
+    elseif openai_tool_choice == "none" or openai_tool_choice == "auto" then
+      return {type = openai_tool_choice}
+    else
+      kong.log.warn("invalid tool choice string: ", openai_tool_choice, ", expected 'required', 'none', or 'auto'")
+      return nil
+    end
+  end
+
+  if type(openai_tool_choice) == "table" then
+    if openai_tool_choice.type == "function" and openai_tool_choice["function"].name then
+      return {type = "tool", name = openai_tool_choice["function"].name}
+    end
+
+    kong.log.warn("invalid tool choice table: ", cjson.encode(openai_tool_choice))
+    return nil
+  end
+
+  kong.log.warn("invalid tool choice type: ", type(openai_tool_choice), ", expected string or table")
+  return nil
+end
+
 local transformers_to = {
   ["llm/v1/chat"] = function(request_table, model)
     local messages = {}
@@ -145,7 +172,7 @@ local transformers_to = {
 
     -- handle function calling translation from OpenAI format
     messages.tools = request_table.tools and to_tools(request_table.tools)
-    messages.tool_choice = request_table.tool_choice
+    messages.tool_choice = request_table.tool_choice and to_tool_choice(request_table.tool_choice)
 
     return messages, "application/json", nil
   end,