fix all conflicts.

This commit is contained in:
geekan 2023-12-26 01:39:16 +08:00
commit d300acbac8
11 changed files with 57 additions and 22 deletions

View file

@ -138,7 +138,9 @@ class Config(metaclass=Singleton):
self.gemini_api_key = self._get("GEMINI_API_KEY")
self.ollama_api_base = self._get("OLLAMA_API_BASE")
self.ollama_api_model = self._get("OLLAMA_API_MODEL")
# _ = self.get_default_llm_provider_enum()
if not self._get("DISABLE_LLM_PROVIDER_CHECK"):
_ = self.get_default_llm_provider_enum()
# self.openai_base_url = self._get("OPENAI_BASE_URL")
self.openai_proxy = self._get("OPENAI_PROXY") or self.global_proxy