From 136b5545ecc77723286ee71d193c1de3c6b7f72c Mon Sep 17 00:00:00 2001 From: Mathew Shen Date: Thu, 5 Sep 2024 17:35:52 +0800 Subject: [PATCH] fix: get config from config value first then environment variable (#1815) --- mem0/embeddings/azure_openai.py | 8 ++++---- mem0/embeddings/openai.py | 4 ++-- mem0/llms/azure_openai.py | 8 ++++---- mem0/llms/groq.py | 2 +- mem0/llms/openai.py | 4 ++-- mem0/llms/openai_structured.py | 4 ++-- mem0/llms/together.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mem0/embeddings/azure_openai.py b/mem0/embeddings/azure_openai.py index 59fe9b8d..8e801ccd 100644 --- a/mem0/embeddings/azure_openai.py +++ b/mem0/embeddings/azure_openai.py @@ -11,10 +11,10 @@ class AzureOpenAIEmbedding(EmbeddingBase): def __init__(self, config: Optional[BaseEmbedderConfig] = None): super().__init__(config) - api_key = os.getenv("EMBEDDING_AZURE_OPENAI_API_KEY") or self.config.azure_kwargs.api_key - azure_deployment = os.getenv("EMBEDDING_AZURE_DEPLOYMENT") or self.config.azure_kwargs.azure_deployment - azure_endpoint = os.getenv("EMBEDDING_AZURE_ENDPOINT") or self.config.azure_kwargs.azure_endpoint - api_version = os.getenv("EMBEDDING_AZURE_API_VERSION") or self.config.azure_kwargs.api_version + api_key = self.config.azure_kwargs.api_key or os.getenv("EMBEDDING_AZURE_OPENAI_API_KEY") + azure_deployment = self.config.azure_kwargs.azure_deployment or os.getenv("EMBEDDING_AZURE_DEPLOYMENT") + azure_endpoint = self.config.azure_kwargs.azure_endpoint or os.getenv("EMBEDDING_AZURE_ENDPOINT") + api_version = self.config.azure_kwargs.api_version or os.getenv("EMBEDDING_AZURE_API_VERSION") self.client = AzureOpenAI( azure_deployment=azure_deployment, diff --git a/mem0/embeddings/openai.py b/mem0/embeddings/openai.py index 30a7c1df..be9195bf 100644 --- a/mem0/embeddings/openai.py +++ b/mem0/embeddings/openai.py @@ -14,8 +14,8 @@ class OpenAIEmbedding(EmbeddingBase): self.config.model = self.config.model or "text-embedding-3-small" self.config.embedding_dims = self.config.embedding_dims or 1536 - api_key = os.getenv("OPENAI_API_KEY") or self.config.api_key - base_url = os.getenv("OPENAI_API_BASE") or self.config.openai_base_url + api_key = self.config.api_key or os.getenv("OPENAI_API_KEY") + base_url = self.config.openai_base_url or os.getenv("OPENAI_API_BASE") self.client = OpenAI(api_key=api_key, base_url=base_url) def embed(self, text): diff --git a/mem0/llms/azure_openai.py b/mem0/llms/azure_openai.py index 8fe03fb8..520631ab 100644 --- a/mem0/llms/azure_openai.py +++ b/mem0/llms/azure_openai.py @@ -16,10 +16,10 @@ class AzureOpenAILLM(LLMBase): if not self.config.model: self.config.model = "gpt-4o" - api_key = os.getenv("LLM_AZURE_OPENAI_API_KEY") or self.config.azure_kwargs.api_key - azure_deployment = os.getenv("LLM_AZURE_DEPLOYMENT") or self.config.azure_kwargs.azure_deployment - azure_endpoint = os.getenv("LLM_AZURE_ENDPOINT") or self.config.azure_kwargs.azure_endpoint - api_version = os.getenv("LLM_AZURE_API_VERSION") or self.config.azure_kwargs.api_version + api_key = self.config.azure_kwargs.api_key or os.getenv("LLM_AZURE_OPENAI_API_KEY") + azure_deployment = self.config.azure_kwargs.azure_deployment or os.getenv("LLM_AZURE_DEPLOYMENT") + azure_endpoint = self.config.azure_kwargs.azure_endpoint or os.getenv("LLM_AZURE_ENDPOINT") + api_version = self.config.azure_kwargs.api_version or os.getenv("LLM_AZURE_API_VERSION") self.client = AzureOpenAI( azure_deployment=azure_deployment, diff --git a/mem0/llms/groq.py b/mem0/llms/groq.py index c08bb511..0163f2c1 100644 --- a/mem0/llms/groq.py +++ b/mem0/llms/groq.py @@ -30,7 +30,7 @@ class GroqLLM(LLMBase): self.config.model = "llama3-70b-8192" self.client = Groq() - api_key = os.getenv("GROQ_API_KEY") or self.config.api_key + api_key = self.config.api_key or os.getenv("GROQ_API_KEY") self.client = Groq(api_key=api_key) def _parse_response(self, response, tools): diff --git a/mem0/llms/openai.py b/mem0/llms/openai.py index cca9e6cd..49005106 100644 --- a/mem0/llms/openai.py +++ b/mem0/llms/openai.py @@ -21,8 +21,8 @@ class OpenAILLM(LLMBase): base_url=self.config.openrouter_base_url, ) else: - api_key = os.getenv("OPENAI_API_KEY") or self.config.api_key - base_url = os.getenv("OPENAI_API_BASE") or self.config.openai_base_url + api_key = self.config.api_key or os.getenv("OPENAI_API_KEY") + base_url = self.config.openai_base_url or os.getenv("OPENAI_API_BASE") self.client = OpenAI(api_key=api_key, base_url=base_url) def _parse_response(self, response, tools): diff --git a/mem0/llms/openai_structured.py b/mem0/llms/openai_structured.py index b713ed7e..d2ea9c4e 100644 --- a/mem0/llms/openai_structured.py +++ b/mem0/llms/openai_structured.py @@ -14,8 +14,8 @@ class OpenAIStructuredLLM(LLMBase): if not self.config.model: self.config.model = "gpt-4o-2024-08-06" - api_key = os.getenv("OPENAI_API_KEY") or self.config.api_key - base_url = os.getenv("OPENAI_API_BASE") or self.config.openai_base_url + api_key = self.config.api_key or os.getenv("OPENAI_API_KEY") + base_url = self.config.openai_base_url or os.getenv("OPENAI_API_BASE") self.client = OpenAI(api_key=api_key, base_url=base_url) diff --git a/mem0/llms/together.py b/mem0/llms/together.py index 046c02be..fa477217 100644 --- a/mem0/llms/together.py +++ b/mem0/llms/together.py @@ -31,7 +31,7 @@ class TogetherLLM(LLMBase): self.config.model = "mistralai/Mixtral-8x7B-Instruct-v0.1" self.client = Together() - api_key = os.getenv("TOGETHER_API_KEY") or self.config.api_key + api_key = self.config.api_key or os.getenv("TOGETHER_API_KEY") self.client = Together(api_key=api_key) def _parse_response(self, response, tools):