🐛 *fix* Fix API key retrieval and validation logic

Author: Abizrh

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+
+[*.lua]
+indent_style = space
+indent_size = 4

lua/commit-ai/backends/common.lua

@@ -0,0 +1,10 @@
+local Log = require("commit-ai.log")
+local M = {}
+
+---@param job Job
+function M.register_job(job)
+    table.insert(M.current_jobs, job)
+    Log.info("Registered completion job")
+end
+
+return M

lua/commit-ai/backends/gemini.lua

@@ -0,0 +1,85 @@
+local Utils = require("commit-ai.utils")
+local Job = require('plenary.job')
+local Log = require("commit-ai.log")
+local Common = require("commit-ai.backends.common")
+
+local M = {}
+
+function M.is_available()
+  local config = require("commit-ai.config")
+  return Utils.get_api_key(config.provider_options.gemini.api_key) and true or false
+end
+
+if not M.is_available() then
+  Log.error("Gemini API_KEY is not set")
+end
+
+function M.query_ai(prompt, cb)
+  local config = require("commit-ai.config")
+  local options = vim.deepcopy(config.provider_options.gemini)
+
+  local request_data = {
+    contents = {
+      {
+        parts = {
+          {
+            text = prompt
+          }
+        }
+      }
+    }
+  }
+
+  local tmp_file = os.tmpname()
+  local f = io.open(tmp_file, "w")
+  if f ~= nil then
+    f:write(vim.json.encode(request_data))
+    f:close()
+  end
+
+  local args = {
+    '-X', 'POST',
+    string.format(
+      'https://generativelanguage.googleapis.com/v1beta/models/%s:%skey=%s',
+      options.model,
+      options.stream and 'streamGenerateContent?alt=sse&' or 'generateContent?',
+      Utils.get_api_key(options.api_key)
+    ),
+    '-H', 'Content-Type: application/json',
+    '-d', '@' .. tmp_file
+  }
+
+
+  local new_job = Job:new {
+    command = "curl",
+    args = args,
+    on_exit = vim.schedule_wrap(function(job, exit_code)
+      os.remove(tmp_file)
+
+      if exit_code ~= 0 then
+        Log.error("API request failed with exit code " .. exit_code)
+        if cb then cb(nil) end
+        return
+      end
+
+      local result = table.concat(job:result(), "\n")
+
+      local success, parsed = pcall(vim.json.decode, result)
+
+      if not success then
+        Log.error("Failed to parse JSON API response: " .. parsed)
+        if cb then cb(nil) end
+        return
+      end
+
+      if cb then cb(parsed) end
+    end)
+  }
+
+  Common.register_job(new_job)
+  new_job:start()
+
+  return new_job
+end
+
+return M

lua/commit-ai/commit.lua

@@ -1,4 +1,5 @@
 local M = {}
 
 
+
 return M

lua/commit-ai/commons.lua

@@ -1,7 +1,5 @@
-local M = {}
-
--- default config
-M.config = {
+local M = {
+  -- default config
   conventions = {
     docs = { icon = "📖", prefix = "docs", type = "Documentation changes" },
     fix = { icon = "🐛", prefix = "fix", type = "Bug fix" },
@@ -10,17 +8,19 @@ M.config = {
     chore = { icon = "🧹", prefix = "chore", type = "Chore" },
     refactor = { icon = "⚠️", prefix = "refactor", type = "Breaking change" }
   },
-  provider_options = {
-    openai = {
-      api_key = 'YOUR_API_KEY',
-    },
-    gemini = {
-      api_key = 'YOUR_API_KEY',
-    },
-    claude = {
-      api_key = 'YOUR_API_KEY',
-    },
-  }
 }
 
+M.provider_options = {
+  openai = {
+    api_key = 'YOUR_API_KEY',
+  },
+  gemini = {
+    api_key = 'YOUR_API_KEY',
+  },
+  claude = {
+    api_key = 'YOUR_API_KEY',
+  },
+}
+
+
 return M

lua/commit-ai/config.lua

@@ -3,11 +3,11 @@ local log = {}
 local p = "[commit-ai.nvim] "
 
 function log.info(txt)
-  vim.notify(p .. txt)
+    vim.notify(p .. txt)
 end
 
 function log.error(txt)
-  vim.notify(p .. txt)
+    vim.notify(p .. txt)
 end
 
 return log

lua/commit-ai/log.lua

@@ -2,25 +2,40 @@ local log = require("commit-ai.log")
 local M = {}
 
 function M.get_git_diff()
-  local staged_diff = vim.fn.system('git diff --cached --no-color')
-  if staged_diff == "" then
-    staged_diff = vim.fn.system('git diff --no-color')
-  end
-  staged_diff = staged_diff:gsub("^%s*(.-)%s*$", "%1") -- Remove trailing newlines
-
-  -- Check if we're in a git repository
-  if vim.fn.system('git rev-parse --is-inside-work-tree 2>/dev/null'):find("true") == nil then
-    log.error("Not in a git repository")
-    return nil
-  end
-
-  -- Check if there are any changes
-  if staged_diff == "" then
-    log.warn("No changes detected")
-    return nil
-  end
-
-  return staged_diff
+    local staged_diff = vim.fn.system('git diff --cached --no-color')
+    if staged_diff == "" then
+        staged_diff = vim.fn.system('git diff --no-color')
+    end
+    staged_diff = staged_diff:gsub("^%s*(.-)%s*$", "%1") -- Remove trailing newlines
+
+    -- Check if we're in a git repository
+    if vim.fn.system('git rev-parse --is-inside-work-tree 2>/dev/null'):find("true") == nil then
+        log.error("Not in a git repository")
+        return nil
+    end
+
+    -- Check if there are any changes
+    if staged_diff == "" then
+        log.warn("No changes detected")
+        return nil
+    end
+
+    return staged_diff
+end
+
+function M.get_api_key(env_var)
+    local api_key
+    if type(env_var) == 'function' then
+        api_key = env_var()
+    elseif type(env_var) == 'string' then
+        api_key = vim.env[env_var]
+    end
+
+    if type(api_key) ~= 'string' or api_key == '' then
+        return nil
+    end
+
+    return api_key
 end
 
 return M