diff --git a/langchain/chains/moderation.py b/langchain/chains/moderation.py index f0ec4afd..32b1b471 100644 --- a/langchain/chains/moderation.py +++ b/langchain/chains/moderation.py @@ -39,7 +39,10 @@ class OpenAIModerationChain(Chain): values, "openai_api_key", "OPENAI_API_KEY" ) openai_organization = get_from_dict_or_env( - values, "openai_organization", "OPENAI_ORGANIZATION", default=None + values, + "openai_organization", + "OPENAI_ORGANIZATION", + default="", ) try: import openai diff --git a/langchain/chat_models/azure_openai.py b/langchain/chat_models/azure_openai.py index 849a82ac..0b052d5f 100644 --- a/langchain/chat_models/azure_openai.py +++ b/langchain/chat_models/azure_openai.py @@ -69,7 +69,10 @@ class AzureChatOpenAI(ChatOpenAI): "OPENAI_API_TYPE", ) openai_organization = get_from_dict_or_env( - values, "openai_organization", "OPENAI_ORGANIZATION", default=None + values, + "openai_organization", + "OPENAI_ORGANIZATION", + default="", ) try: import openai diff --git a/langchain/chat_models/openai.py b/langchain/chat_models/openai.py index f05c9ec4..667934d8 100644 --- a/langchain/chat_models/openai.py +++ b/langchain/chat_models/openai.py @@ -152,7 +152,10 @@ class ChatOpenAI(BaseChatModel): values, "openai_api_key", "OPENAI_API_KEY" ) openai_organization = get_from_dict_or_env( - values, "openai_organization", "OPENAI_ORGANIZATION", default=None + values, + "openai_organization", + "OPENAI_ORGANIZATION", + default="", ) try: import openai diff --git a/langchain/embeddings/openai.py b/langchain/embeddings/openai.py index 6c206ebc..c66fd226 100644 --- a/langchain/embeddings/openai.py +++ b/langchain/embeddings/openai.py @@ -160,7 +160,10 @@ class OpenAIEmbeddings(BaseModel, Embeddings): values, "openai_api_key", "OPENAI_API_KEY" ) openai_organization = get_from_dict_or_env( - values, "openai_organization", "OPENAI_ORGANIZATION", default=None + values, + "openai_organization", + "OPENAI_ORGANIZATION", + default="", ) try: import openai diff --git a/langchain/llms/openai.py b/langchain/llms/openai.py index 66c2d70a..02be32ec 100644 --- a/langchain/llms/openai.py +++ b/langchain/llms/openai.py @@ -205,7 +205,10 @@ class BaseOpenAI(BaseLLM): values, "openai_api_key", "OPENAI_API_KEY" ) openai_organization = get_from_dict_or_env( - values, "openai_organization", "OPENAI_ORGANIZATION", default=None + values, + "openai_organization", + "OPENAI_ORGANIZATION", + default="", ) try: import openai @@ -596,7 +599,7 @@ class OpenAIChat(BaseLLM): values, "openai_api_key", "OPENAI_API_KEY" ) openai_organization = get_from_dict_or_env( - values, "openai_organization", "OPENAI_ORGANIZATION", default=None + values, "openai_organization", "OPENAI_ORGANIZATION", default="" ) try: import openai