klas/t6_mem0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: get config from config value first then environment variable (#1815)

Browse Source
This commit is contained in:
Mathew Shen
2024-09-05 17:35:52 +08:00
committed by GitHub
parent 8099d60e0e
commit 136b5545ec
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mem0/embeddings/azure_openai.py
View File

@@ -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,

4
mem0/embeddings/openai.py
View File

@@ -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):

8
mem0/llms/azure_openai.py
View File

@@ -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,

2
mem0/llms/groq.py
View File

@@ -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):

4
mem0/llms/openai.py
View File

@@ -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):

4
mem0/llms/openai_structured.py
View File

@@ -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)

2
mem0/llms/together.py
View File

@@ -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):