The Memory Layer for AI Agents - Drop-in memory infrastructure for AI agents and apps. Context that persists. Built for production.
Python agentic-memoryagentic-memory-systemagentsaiai-agentschatgptgenaillmlong-term-memorymemorymemory-managementpythonragstate-management
Open AI env var fix (#2384)
Pranav Puranik4321d24284b9
diff --git a/docs/components/llms/config.mdx b/docs/components/llms/config.mdxindex 4c9f22811..57c8f70c4 100644--- a/docs/components/llms/config.mdx+++ b/docs/components/llms/config.mdx@@ -29,7 +29,7 @@ iconType: "solid"Config values are applied in the following order of precedence (from highest to lowest):1. Values explicitly set in the `config` object/dictionary-2. Environment variables (e.g., `OPENAI_API_KEY`, `OPENAI_API_BASE`)+2. Environment variables (e.g., `OPENAI_API_KEY`, `OPENAI_BASE_URL`)3. Default values defined in the LLM implementationThis means that values specified in the `config` will override corresponding environment variables, which in turn override default values.diff --git a/embedchain/embedchain/embedder/openai.py b/embedchain/embedchain/embedder/openai.pyindex d9f4c7420..e14a1aa70 100644--- a/embedchain/embedchain/embedder/openai.py+++ b/embedchain/embedchain/embedder/openai.py@@ -1,4 +1,5 @@import os+import warningsfrom typing import Optionalfrom chromadb.utils.embedding_functions import OpenAIEmbeddingFunction@@ -16,7 +17,18 @@ class OpenAIEmbedder(BaseEmbedder):self.config.model = "text-embedding-ada-002"api_key = self.config.api_key or os.environ["OPENAI_API_KEY"]- api_base = self.config.api_base or os.environ.get("OPENAI_API_BASE")+ api_base = (+ self.config.api_base+ or os.environ.get("OPENAI_API_BASE")+ or os.getenv("OPENAI_BASE_URL")+ or "https://api.openai.com/v1"+ )+ if os.environ.get("OPENAI_API_BASE"):+ warnings.warn(+ "The environment variable 'OPENAI_API_BASE' is deprecated and will be removed in the 0.1.140. "+ "Please use 'OPENAI_BASE_URL' instead.",+ DeprecationWarning+ )if api_key is None and os.getenv("OPENAI_ORGANIZATION") is None:raise ValueError("OPENAI_API_KEY or OPENAI_ORGANIZATION environment variables not provided") # noqa:E501diff --git a/embedchain/embedchain/llm/openai.py b/embedchain/embedchain/llm/openai.pyindex a595ee605..ace146118 100644--- a/embedchain/embedchain/llm/openai.py+++ b/embedchain/embedchain/llm/openai.py@@ -1,5 +1,6 @@import jsonimport os+import warningsfrom typing import Any, Callable, Dict, Optional, Type, Unionfrom langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler@@ -58,7 +59,19 @@ class OpenAILlm(BaseLlm):"model_kwargs": config.model_kwargs or {},}api_key = config.api_key or os.environ["OPENAI_API_KEY"]- base_url = config.base_url or os.environ.get("OPENAI_API_BASE", None)+ base_url = (+ config.base_url+ or os.getenv("OPENAI_API_BASE")+ or os.getenv("OPENAI_BASE_URL")+ or "https://api.openai.com/v1"+ )+ if os.environ.get("OPENAI_API_BASE"):+ warnings.warn(+ "The environment variable 'OPENAI_API_BASE' is deprecated and will be removed in the 0.1.140. "+ "Please use 'OPENAI_BASE_URL' instead.",+ DeprecationWarning+ )+if config.top_p:kwargs["top_p"] = config.top_pif config.default_headers:diff --git a/mem0/embeddings/openai.py b/mem0/embeddings/openai.pyindex 649f257bb..1ec5bd1ac 100644--- a/mem0/embeddings/openai.py+++ b/mem0/embeddings/openai.py@@ -1,4 +1,5 @@import os+import warningsfrom typing import Literal, Optionalfrom openai import OpenAI@@ -15,7 +16,19 @@ class OpenAIEmbedding(EmbeddingBase):self.config.embedding_dims = self.config.embedding_dims or 1536api_key = self.config.api_key or os.getenv("OPENAI_API_KEY")- base_url = self.config.openai_base_url or os.getenv("OPENAI_API_BASE")+ base_url = (+ self.config.openai_base_url+ or os.getenv("OPENAI_API_BASE")+ or os.getenv("OPENAI_BASE_URL")+ or "https://api.openai.com/v1"+ )+ if os.environ.get("OPENAI_API_BASE"):+ warnings.warn(+ "The environment variable 'OPENAI_API_BASE' is deprecated and will be removed in the 0.1.80. "+ "Please use 'OPENAI_BASE_URL' instead.",+ DeprecationWarning+ )+self.client = OpenAI(api_key=api_key, base_url=base_url)def embed(self, text, memory_action: Optional[Literal["add", "search", "update"]] = None):diff --git a/mem0/llms/openai.py b/mem0/llms/openai.pyindex a9c302f8c..078f1aa8c 100644--- a/mem0/llms/openai.py+++ b/mem0/llms/openai.py@@ -1,5 +1,5 @@-import jsonimport os+import warningsfrom typing import Dict, List, Optionalfrom openai import OpenAI@@ -24,7 +24,19 @@ class OpenAILLM(LLMBase):)else: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") or "https://api.openai.com/v1"+ base_url = (+ self.config.openai_base_url+ or os.getenv("OPENAI_API_BASE")+ or os.getenv("OPENAI_BASE_URL")+ or "https://api.openai.com/v1"+ )+ if os.environ.get("OPENAI_API_BASE"):+ warnings.warn(+ "The environment variable 'OPENAI_API_BASE' is deprecated and will be removed in the 0.1.80. "+ "Please use 'OPENAI_BASE_URL' instead.",+ DeprecationWarning+ )+self.client = OpenAI(api_key=api_key, base_url=base_url)def _parse_response(self, response, tools):