fix: #48 calling unused adapters

olimorris · Apr 24, 2024 · 12fd54c · 12fd54c
1 parent e8c749a
commit 12fd54c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -97,9 +97,9 @@ You only need to the call the `setup` function if you wish to change any of the
 ```lua
 require("codecompanion").setup({
   adapters = {
-    anthropic = require("codecompanion.adapters").use("anthropic"),
-    ollama = require("codecompanion.adapters").use("ollama"),
-    openai = require("codecompanion.adapters").use("openai"),
+    anthropic = "anthropic",
+    ollama = "ollama",
+    openai = "openai",
   },
   strategies = {
     chat = "openai",

diff --git a/doc/codecompanion.txt b/doc/codecompanion.txt
@@ -1,4 +1,4 @@
-*codecompanion.txt*         For NVIM v0.9.2         Last change: 2024 April 08
+*codecompanion.txt*         For NVIM v0.9.2         Last change: 2024 April 24
 
 ==============================================================================
 Table of Contents                            *codecompanion-table-of-contents*
@@ -75,9 +75,9 @@ Click to see the default configuration ~
 >lua
     require("codecompanion").setup({
       adapters = {
-        anthropic = require("codecompanion.adapters").use("anthropic"),
-        ollama = require("codecompanion.adapters").use("ollama"),
-        openai = require("codecompanion.adapters").use("openai"),
+        anthropic = "anthropic",
+        ollama = "ollama",
+        openai = "openai",
       },
       strategies = {
         chat = "openai",

diff --git a/lua/codecompanion/adapters/ollama.lua b/lua/codecompanion/adapters/ollama.lua
@@ -1,13 +1,13 @@
 local log = require("codecompanion.utils.log")
 
 local function get_ollama_choices()
-  local handle = io.popen 'ollama list'
+  local handle = io.popen("ollama list")
   local result = {}
 
   if handle then
     for line in handle:lines() do
-      local first_word = line:match '%S+'
-      if first_word ~= nil and first_word ~= 'NAME' then
+      local first_word = line:match("%S+")
+      if first_word ~= nil and first_word ~= "NAME" then
         table.insert(result, first_word)
       end
     end

diff --git a/lua/codecompanion/config.lua b/lua/codecompanion/config.lua
@@ -2,9 +2,9 @@ local M = {}
 
 local defaults = {
   adapters = {
-    anthropic = require("codecompanion.adapters").use("anthropic"),
-    ollama = require("codecompanion.adapters").use("ollama"),
-    openai = require("codecompanion.adapters").use("openai"),
+    anthropic = "anthropic",
+    ollama = "ollama",
+    openai = "openai",
   },
   strategies = {
     chat = "openai",
@@ -68,11 +68,15 @@ M.setup = function(opts)
   if opts and opts.adapters then
     for name, adapter in pairs(opts.adapters) do
       if M.options.adapters[name] then
-        if adapter.schema then
-          M.options.adapters[name].schema =
-            vim.tbl_deep_extend("force", M.options.adapters[name].schema, adapter.schema)
+        if type(adapter) == "string" then
+          M.options.adapters[name] = require("codecompanion.adapters").use(adapter)
+        elseif type(adapter) == "table" then
+          M.options.adapters[name] = adapter
+          if adapter.schema then
+            M.options.adapters[name].schema =
+              vim.tbl_deep_extend("force", M.options.adapters[name].schema, adapter.schema)
+          end
         end
-        M.options.adapters[name] = adapter
       end
     end
   end