fix(llm): fix error when upstream_url missing trailing slash

AG-203
Kong · Jan 17, 2025 · 1a3f012 · 1a3f012
1 parent 443c075
commit 1a3f012
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/changelog/unreleased/kong/fix-ai-upstream-url-trailing-empty.yml b/changelog/unreleased/kong/fix-ai-upstream-url-trailing-empty.yml
@@ -0,0 +1,4 @@
+message: |
+  **AI Plugins**: fix AI upstream URL trailing being empty
+type: bugfix
+scope: Plugin
diff --git a/kong/llm/drivers/anthropic.lua b/kong/llm/drivers/anthropic.lua
@@ -530,7 +530,7 @@ function _M.configure_request(conf)
   ai_shared.override_upstream_url(parsed_url, conf)
 
   -- if the path is read from a URL capture, ensure that it is valid
-  parsed_url.path = string_gsub(parsed_url.path, "^/*", "/")
+  parsed_url.path = (parsed_url.path and string_gsub(parsed_url.path, "^/*", "/")) or "/"
 
   kong.service.request.set_path(parsed_url.path)
   kong.service.request.set_scheme(parsed_url.scheme)

diff --git a/kong/llm/drivers/azure.lua b/kong/llm/drivers/azure.lua
@@ -121,7 +121,7 @@ function _M.configure_request(conf)
   ai_shared.override_upstream_url(parsed_url, conf)
 
   -- if the path is read from a URL capture, 3re that it is valid
-  parsed_url.path = string_gsub(parsed_url.path, "^/*", "/")
+  parsed_url.path = (parsed_url.path and string_gsub(parsed_url.path, "^/*", "/")) or "/"
 
   kong.service.request.set_path(parsed_url.path)
   kong.service.request.set_scheme(parsed_url.scheme)

diff --git a/kong/llm/drivers/bedrock.lua b/kong/llm/drivers/bedrock.lua
@@ -568,7 +568,7 @@ function _M.configure_request(conf, aws_sdk)
   end
 
   -- if the path is read from a URL capture, ensure that it is valid
-  parsed_url.path = string_gsub(parsed_url.path, "^/*", "/")
+  parsed_url.path = (parsed_url.path and string_gsub(parsed_url.path, "^/*", "/")) or "/"
 
   ai_shared.override_upstream_url(parsed_url, conf)
 

diff --git a/kong/llm/drivers/cohere.lua b/kong/llm/drivers/cohere.lua
@@ -509,7 +509,7 @@ function _M.configure_request(conf)
 
 
   -- if the path is read from a URL capture, ensure that it is valid
-  parsed_url.path = string_gsub(parsed_url.path, "^/*", "/")
+  parsed_url.path = (parsed_url.path and string_gsub(parsed_url.path, "^/*", "/")) or "/"
 
   kong.service.request.set_path(parsed_url.path)
   kong.service.request.set_scheme(parsed_url.scheme)

diff --git a/kong/llm/drivers/gemini.lua b/kong/llm/drivers/gemini.lua
@@ -519,7 +519,7 @@ function _M.configure_request(conf, identity_interface)
 
 
   -- if the path is read from a URL capture, ensure that it is valid
-  parsed_url.path = string_gsub(parsed_url.path, "^/*", "/")
+  parsed_url.path = (parsed_url.path and string_gsub(parsed_url.path, "^/*", "/")) or "/"
 
   kong.service.request.set_path(parsed_url.path)
   kong.service.request.set_scheme(parsed_url.scheme)

diff --git a/kong/llm/drivers/openai.lua b/kong/llm/drivers/openai.lua
@@ -205,7 +205,7 @@ function _M.configure_request(conf)
   ai_shared.override_upstream_url(parsed_url, conf)
 
   -- if the path is read from a URL capture, ensure that it is valid
-  parsed_url.path = string_gsub(parsed_url.path, "^/*", "/")
+  parsed_url.path = (parsed_url.path and string_gsub(parsed_url.path, "^/*", "/")) or "/"
 
   kong.service.request.set_path(parsed_url.path)
   kong.service.request.set_scheme(parsed_url.scheme)