fixing envs

huynle · Jan 29, 2024 · 8fa1e0a · 8fa1e0a
1 parent 1eef311
commit 8fa1e0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/lua/ogpt/provider/ollama.lua b/lua/ogpt/provider/ollama.lua
@@ -1,3 +1,4 @@
+local Config = require("ogpt.config")
 local utils = require("ogpt.utils")
 
 local M = {}
@@ -8,8 +9,10 @@ M.models = {}
 
 function M.load_envs(envs)
   local _envs = {}
-  _envs.OLLAMA_API_HOST = M.envs.api_host or os.getenv("OLLAMA_API_HOST") or "http://localhost:11434"
-  _envs.OLLAMA_API_KEY = M.envs.api_key or os.getenv("OLLAMA_API_KEY") or ""
+  _envs.OLLAMA_API_HOST = Config.options.providers.ollama.api_host
+    or os.getenv("OLLAMA_API_HOST")
+    or "http://localhost:11434"
+  _envs.OLLAMA_API_KEY = Config.options.providers.ollama.api_key or os.getenv("OLLAMA_API_KEY") or ""
   _envs.MODELS_URL = utils.ensureUrlProtocol(_envs.OLLAMA_API_HOST .. "/api/tags")
   _envs.COMPLETIONS_URL = utils.ensureUrlProtocol(_envs.OLLAMA_API_HOST .. "/api/generate")
   _envs.CHAT_COMPLETIONS_URL = utils.ensureUrlProtocol(_envs.OLLAMA_API_HOST .. "/api/chat")

diff --git a/lua/ogpt/provider/openai.lua b/lua/ogpt/provider/openai.lua
@@ -1,3 +1,4 @@
+local Config = require("ogpt.config")
 local utils = require("ogpt.utils")
 
 local M = {}
@@ -8,8 +9,10 @@ M.envs = {}
 
 function M.load_envs()
   local _envs = {}
-  _envs.OPENAI_API_HOST = M.envs.api_host or os.getenv("OPENAI_API_HOST") or "https://api.openai.com"
-  _envs.OPENAI_API_KEY = M.envs.api_key or os.getenv("OPENAI_API_KEY") or ""
+  _envs.OPENAI_API_HOST = Config.options.providers.openai.api_host
+    or os.getenv("OPENAI_API_HOST")
+    or "https://api.openai.com"
+  _envs.OPENAI_API_KEY = Config.options.providers.openai.api_key or os.getenv("OPENAI_API_KEY") or ""
   _envs.MODELS_URL = utils.ensureUrlProtocol(_envs.OPENAI_API_HOST .. "/v1/models")
   _envs.COMPLETIONS_URL = utils.ensureUrlProtocol(_envs.OPENAI_API_HOST .. "/v1/completions")
   _envs.CHAT_COMPLETIONS_URL = utils.ensureUrlProtocol(_envs.OPENAI_API_HOST .. "/v1/chat/completions")

diff --git a/lua/ogpt/provider/textgenui.lua b/lua/ogpt/provider/textgenui.lua
@@ -1,3 +1,4 @@
+local Config = require("ogpt.config")
 local utils = require("ogpt.utils")
 local M = {}
 
@@ -25,12 +26,14 @@ M.envs = {}
 
 function M.load_envs()
   local _envs = {}
-  _envs.TEXTGEN_API_HOST = M.envs.api_host or os.getenv("TEXTGEN_API_HOST") or "https://api.textgen.com"
-  _envs.TEXTGEN_API_KEY = M.envs.api_key or os.getenv("TEXTGEN_API_KEY") or ""
+  _envs.TEXTGEN_API_HOST = Config.options.providers.textgenui.api_host
+    or os.getenv("TEXTGEN_API_HOST")
+    or "https://api.textgen.com"
+  _envs.TEXTGEN_API_KEY = Config.options.providers.textgenui.api_key or os.getenv("TEXTGEN_API_KEY") or ""
   _envs.MODELS_URL = utils.ensureUrlProtocol(_envs.TEXTGEN_API_HOST .. "/api/tags")
   _envs.COMPLETIONS_URL = utils.ensureUrlProtocol(_envs.TEXTGEN_API_HOST)
   _envs.CHAT_COMPLETIONS_URL = utils.ensureUrlProtocol(_envs.TEXTGEN_API_HOST)
-  _envs.AUTHORIZATION_HEADER = "Authorization: Bearer " .. (_envs.TEXTGEN_API_HOST or " ")
+  _envs.AUTHORIZATION_HEADER = "Authorization: Bearer " .. (_envs.TEXTGEN_API_KEY or " ")
   M.envs = vim.tbl_extend("force", M.envs, _envs)
   return M.envs
 end