refactor: use OpenAI handler with parse_extra for DeepSeek adapter and add test

Author: Davidyz

lua/codecompanion/adapters/http/deepseek.lua

@@ -94,73 +94,15 @@ return {
     ---@param tools? table The table to write any tool output to
     ---@return { status: string, output: { role: string, content: string, reasoning: string? } } | nil
     chat_output = function(self, data, tools)
-      local output = {}
-
-      if data and data ~= "" then
-        local data_mod = adapter_utils.clean_streamed_data(data)
-        local ok, json = pcall(vim.json.decode, data_mod, { luanil = { object = true } })
-
-        if ok and json.choices and #json.choices > 0 then
-          local choice = json.choices[1]
-          local delta = (self.opts and self.opts.stream) and choice.delta or choice.message
-
-          if delta then
-            output.role = delta.role
-            output.content = delta.content
-
-            if delta.reasoning_content then
-              output.reasoning = output.reasoning or {}
-              output.reasoning.content = delta.reasoning_content
-            end
-
-            -- Process tools
-            if self.opts.tools and delta.tool_calls and tools then
-              for _, tool in ipairs(delta.tool_calls) do
-                if self.opts.stream then
-                  local index = tool.index
-                  local found = false
-
-                  for i, existing_tool in ipairs(tools) do
-                    if existing_tool._index == index then
-                      tools[i]["function"].arguments = (tools[i]["function"].arguments or "")
-                        .. (tool["function"]["arguments"] or "")
-                      found = true
-                      break
-                    end
-                  end
-
-                  if not found then
-                    table.insert(tools, {
-                      ["function"] = {
-                        name = tool["function"]["name"],
-                        arguments = tool["function"]["arguments"] or "",
-                      },
-                      id = tool.id,
-                      type = "function",
-                      _index = index,
-                    })
-                  end
-                else
-                  table.insert(tools, {
-                    _index = tool.index,
-                    ["function"] = {
-                      name = tool["function"]["name"],
-                      arguments = tool["function"]["arguments"],
-                    },
-                    id = tool.id,
-                    type = "function",
-                  })
-                end
-              end
-            end
-
-            return {
-              status = "success",
-              output = output,
-            }
-          end
-        end
+      return openai.handlers.chat_output(self, data, tools)
+    end,
+    parse_extra = function(self, data)
+      local extra = data.extra
+      if extra.reasoning_content then
+        data.output.reasoning = { content = extra.reasoning_content }
+        data.output.content = nil
       end
+      return data
     end,
     inline_output = function(self, data, context)
       return openai.handlers.inline_output(self, data, context)

test_json.lua

@@ -0,0 +1,44 @@
+local jsonschema = require("jsonschema")
+local schema = {
+  type = "object",
+  properties = {
+    command = {
+      type = "string",
+      enum = { "query", "ls" },
+      description = "Action to perform: 'query' for semantic search or 'ls' to list projects",
+    },
+    options = {
+      type = "object",
+      properties = {
+        query = {
+          type = "array",
+          items = { type = "string" },
+          description = "Query messages used for the search.",
+        },
+        count = {
+          type = "integer",
+          description = "Number of documents to retrieve, must be positive",
+        },
+        project_root = {
+          type = "string",
+          description = "Project path to search within (must be from 'ls' results)",
+        },
+      },
+      required = { "query" },
+      additionalProperties = false,
+    },
+  },
+  required = { "command" },
+  additionalProperties = false,
+}
+
+local args = { {
+  command = "query",
+  options = { query = { "hi" } },
+}, { command = "ls" }, { command = "fhdsaif" } }
+
+local validator = jsonschema.generate_validator(schema)
+for _, arg in pairs(args) do
+  local res, err = validator(arg, schema)
+  vim.notify(vim.inspect({ args = arg, result = res, error = err }))
+end

tests/adapters/http/test_deepseek.lua

@@ -200,6 +200,9 @@ T["DeepSeek adapter"]["Streaming"]["can handle reasoning content when streaming"
   local lines = vim.fn.readfile("tests/adapters/http/stubs/deepseek_streaming.txt")
   for _, line in ipairs(lines) do
     local chat_output = adapter.handlers.chat_output(adapter, line)
+    if adapter.handlers.parse_extra and chat_output.extra then
+      chat_output = adapter.handlers.parse_extra(adapter, chat_output)
+    end
     if chat_output then
       if chat_output.output.reasoning and chat_output.output.reasoning.content then
         output.reasoning.content = output.reasoning.content .. chat_output.output.reasoning.content
@@ -277,7 +280,7 @@ T["DeepSeek adapter"]["No Streaming"]["can process tools"] = function()
 
   local tool_output = {
     {
-      _index = 0,
+      _index = 1,
       ["function"] = {
         arguments = '{"location": "London", "units": "celsius"}',
         name = "weather",
@@ -286,7 +289,7 @@ T["DeepSeek adapter"]["No Streaming"]["can process tools"] = function()
       type = "function",
     },
     {
-      _index = 1,
+      _index = 2,
       ["function"] = {
         arguments = '{"location": "Paris", "units": "celsius"}',
         name = "weather",