Skip to content

The agent engineering platform.

partners[azure]: fix having openai_api_base set for other packages (#22068)

Chip Davis04bc5f1a95cf
diff --git a/libs/partners/openai/langchain_openai/chat_models/azure.py b/libs/partners/openai/langchain_openai/chat_models/azure.py
index faa8d747c1..76a3e6139d 100644
--- a/libs/partners/openai/langchain_openai/chat_models/azure.py
+++ b/libs/partners/openai/langchain_openai/chat_models/azure.py
@@ -1,4 +1,5 @@
"""Azure OpenAI chat wrapper."""
+
from __future__ import annotations
import logging
@@ -548,8 +549,10 @@ class AzureChatOpenAI(BaseChatOpenAI):
values["openai_api_key"] = (
convert_to_secret_str(openai_api_key) if openai_api_key else None
)
- values["openai_api_base"] = values["openai_api_base"] or os.getenv(
- "OPENAI_API_BASE"
+ values["openai_api_base"] = (
+ values["openai_api_base"]
+ if "openai_api_base" in values
+ else os.getenv("OPENAI_API_BASE")
)
values["openai_api_version"] = values["openai_api_version"] or os.getenv(
"OPENAI_API_VERSION"
@@ -601,12 +604,16 @@ class AzureChatOpenAI(BaseChatOpenAI):
"api_version": values["openai_api_version"],
"azure_endpoint": values["azure_endpoint"],
"azure_deployment": values["deployment_name"],
- "api_key": values["openai_api_key"].get_secret_value()
- if values["openai_api_key"]
- else None,
- "azure_ad_token": values["azure_ad_token"].get_secret_value()
- if values["azure_ad_token"]
- else None,
+ "api_key": (
+ values["openai_api_key"].get_secret_value()
+ if values["openai_api_key"]
+ else None
+ ),
+ "azure_ad_token": (
+ values["azure_ad_token"].get_secret_value()
+ if values["azure_ad_token"]
+ else None
+ ),
"azure_ad_token_provider": values["azure_ad_token_provider"],
"organization": values["openai_organization"],
"base_url": values["openai_api_base"],
diff --git a/libs/partners/openai/langchain_openai/embeddings/azure.py b/libs/partners/openai/langchain_openai/embeddings/azure.py
index 3b240d528f..f56515f715 100644
--- a/libs/partners/openai/langchain_openai/embeddings/azure.py
+++ b/libs/partners/openai/langchain_openai/embeddings/azure.py
@@ -75,8 +75,10 @@ class AzureOpenAIEmbeddings(OpenAIEmbeddings):
values["openai_api_key"] = (
convert_to_secret_str(openai_api_key) if openai_api_key else None
)
- values["openai_api_base"] = values["openai_api_base"] or os.getenv(
- "OPENAI_API_BASE"
+ values["openai_api_base"] = (
+ values["openai_api_base"]
+ if "openai_api_base" in values
+ else os.getenv("OPENAI_API_BASE")
)
values["openai_api_version"] = values["openai_api_version"] or os.getenv(
"OPENAI_API_VERSION", default="2023-05-15"
diff --git a/libs/partners/openai/tests/unit_tests/chat_models/test_azure.py b/libs/partners/openai/tests/unit_tests/chat_models/test_azure.py
index e9f1847632..8acc343acb 100644
--- a/libs/partners/openai/tests/unit_tests/chat_models/test_azure.py
+++ b/libs/partners/openai/tests/unit_tests/chat_models/test_azure.py
@@ -1,5 +1,7 @@
"""Test Azure OpenAI Chat API wrapper."""
+import os
+
from langchain_openai import AzureChatOpenAI
@@ -32,3 +34,25 @@ def test_initialize_more() -> None:
ls_params = llm._get_ls_params()
assert ls_params["ls_provider"] == "azure"
assert ls_params["ls_model_name"] == "35-turbo-dev"
+
+
+def test_initialize_azure_openai_with_openai_api_base_set() -> None:
+ os.environ["OPENAI_API_BASE"] = "https://api.openai.com"
+ llm = AzureChatOpenAI(
+ api_key="xyz",
+ azure_endpoint="my-base-url",
+ azure_deployment="35-turbo-dev",
+ openai_api_version="2023-05-15",
+ temperature=0,
+ openai_api_base=None,
+ )
+ assert llm.openai_api_key is not None
+ assert llm.openai_api_key.get_secret_value() == "xyz"
+ assert llm.azure_endpoint == "my-base-url"
+ assert llm.deployment_name == "35-turbo-dev"
+ assert llm.openai_api_version == "2023-05-15"
+ assert llm.temperature == 0
+
+ ls_params = llm._get_ls_params()
+ assert ls_params["ls_provider"] == "azure"
+ assert ls_params["ls_model_name"] == "35-turbo-dev"
diff --git a/libs/partners/openai/tests/unit_tests/embeddings/test_azure_embeddings.py b/libs/partners/openai/tests/unit_tests/embeddings/test_azure_embeddings.py
new file mode 100644
index 0000000000..6a6af8ba70
--- /dev/null
+++ b/libs/partners/openai/tests/unit_tests/embeddings/test_azure_embeddings.py
@@ -0,0 +1,27 @@
+import os
+
+from langchain_openai import AzureOpenAIEmbeddings
+
+
+def test_initialize_azure_openai() -> None:
+ embeddings = AzureOpenAIEmbeddings(
+ model="text-embedding-large",
+ api_key="xyz",
+ azure_endpoint="my-base-url",
+ azure_deployment="35-turbo-dev",
+ openai_api_version="2023-05-15",
+ )
+ assert embeddings.model == "text-embedding-large"
+
+
+def test_intialize_azure_openai_with_base_set() -> None:
+ os.environ["OPENAI_API_BASE"] = "https://api.openai.com"
+ embeddings = AzureOpenAIEmbeddings(
+ model="text-embedding-large",
+ api_key="xyz",
+ azure_endpoint="my-base-url",
+ azure_deployment="35-turbo-dev",
+ openai_api_version="2023-05-15",
+ openai_api_base=None,
+ )
+ assert embeddings.model == "text-embedding-large"