fix(adapter): variable substitution in 'raw'.

Pass adapter.raw through adapter:set_env_vars() to enable variable substitution.

Also appends adapter.raw to the static raw arguments defined in the http client.

Author: pettni

lua/codecompanion/http.lua

@@ -101,12 +101,16 @@ function Client:request(payload, actions, opts)
     table.insert(raw, "--no-buffer")
   end
 
+  if adapter.raw then
+    vim.list_extend(raw, adapter:set_env_vars(adapter.raw))
+  end
+
   local request_opts = {
     url = adapter:set_env_vars(adapter.url),
     headers = adapter:set_env_vars(adapter.headers),
     insecure = config.adapters.opts.allow_insecure,
     proxy = config.adapters.opts.proxy,
-    raw = adapter.raw or raw,
+    raw = raw,
     body = body_file.filename or "",
     -- This is called when the request is finished. It will only ever be called
     -- once, even if the endpoint is streaming.

tests/test_http.lua

@@ -1,20 +1,26 @@
-local h = require("tests.helpers")
-
 local assert = require("luassert")
-local codecompanion = require("codecompanion")
 local stub = require("luassert.stub")
 
 local Client
 
 local adapter = {
   name = "TestAdapter",
-  url = "https://api.openai.com/v1/chat/completions",
+  url = "https://api.openai.com/v1/${url_value}/completions",
+  env = {
+    url_value = "chat",
+    header_value = "json",
+    raw_value = "RAW_VALUE",
+  },
   headers = {
-    content_type = "application/json",
+    content_type = "application/${header_value}",
   },
   parameters = {
     stream = true,
   },
+  raw = {
+    "--arg1-${raw_value}",
+    "--arg2-${raw_value}",
+  },
   handlers = {
     form_parameters = function()
       return {}
@@ -65,4 +71,31 @@ describe("Client", function()
 
     assert.stub(mock_request).was_called(1)
   end)
+
+  it("substitutes variables", function()
+    local mock_request = stub.new().returns(nil)
+
+    Client.static.opts = {
+      post = { default = mock_request },
+      encode = { default = stub.new().returns("{}") },
+    }
+
+    adapter = require("codecompanion.adapters").new(adapter)
+
+    Client.new({ adapter = adapter }):request({}, { callback = stub.new() })
+
+    assert.stub(mock_request).was_called(1)
+    local request_args = mock_request.calls[1].refs[1]
+
+    -- can substitute in 'address'
+    assert.equal(request_args.url, "https://api.openai.com/v1/chat/completions")
+
+    -- can substitute in 'headers'
+    assert.equal(request_args.headers.content_type, "application/json")
+
+    -- can substitute in 'raw'
+    local raw_args = request_args.raw
+    assert.equal(raw_args[#raw_args - 1], "--arg1-RAW_VALUE")
+    assert.equal(raw_args[#raw_args], "--arg2-RAW_VALUE")
+  end)
 end)