updating chat, embeddings, llms files and adding test

Author: marlenezw

libs/partners/openai/langchain_openai/chat_models/base.py

@@ -16,14 +16,7 @@
 from json import JSONDecodeError
 from math import ceil
 from operator import itemgetter
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Literal,
-    TypeAlias,
-    TypeVar,
-    cast,
-)
+from typing import TYPE_CHECKING, Any, Literal, TypeAlias, TypeVar, cast
 from urllib.parse import urlparse
 
 import certifi
@@ -34,10 +27,7 @@
     CallbackManagerForLLMRun,
 )
 from langchain_core.language_models import LanguageModelInput
-from langchain_core.language_models.chat_models import (
-    BaseChatModel,
-    LangSmithParams,
-)
+from langchain_core.language_models.chat_models import BaseChatModel, LangSmithParams
 from langchain_core.messages import (
     AIMessage,
     AIMessageChunk,
@@ -55,9 +45,9 @@
     ToolCall,
     ToolMessage,
     ToolMessageChunk,
-    is_data_content_block,
 )
 from langchain_core.messages import content as types
+from langchain_core.messages import is_data_content_block
 from langchain_core.messages.ai import (
     InputTokenDetails,
     OutputTokenDetails,
@@ -96,16 +86,6 @@
     is_basemodel_subclass,
 )
 from langchain_core.utils.utils import _build_model_kwargs, from_env, secret_from_env
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    SecretStr,
-    model_validator,
-)
-from pydantic.v1 import BaseModel as BaseModelV1
-from typing_extensions import Self
-
 from langchain_openai.chat_models._client_utils import (
     _get_default_async_httpx_client,
     _get_default_httpx_client,
@@ -115,6 +95,9 @@
     _convert_from_v1_to_responses,
     _convert_to_v03_ai_message,
 )
+from pydantic import BaseModel, ConfigDict, Field, SecretStr, model_validator
+from pydantic.v1 import BaseModel as BaseModelV1
+from typing_extensions import Self
 
 if TYPE_CHECKING:
     from openai.types.responses import Response
@@ -465,8 +448,11 @@ class BaseChatOpenAI(BaseChatModel):
     """What sampling temperature to use."""
     model_kwargs: dict[str, Any] = Field(default_factory=dict)
     """Holds any model parameters valid for `create` call not explicitly specified."""
-    openai_api_key: SecretStr | None = Field(
-        alias="api_key", default_factory=secret_from_env("OPENAI_API_KEY", default=None)
+    openai_api_key: SecretStr | None | Callable[[], str] = Field(
+        alias="api_key",
+        default_factory=secret_from_env(
+            ["OPENAI_API_KEY", "AZURE_OPENAI_API_KEY"], default=None
+        ),
     )
     openai_api_base: str | None = Field(default=None, alias="base_url")
     """Base URL path for API requests, leave blank if not using a proxy or service emulator."""  # noqa: E501
@@ -776,10 +762,16 @@ def validate_environment(self) -> Self:
         ):
             self.stream_usage = True
 
+        # Resolve API key from SecretStr or Callable
+        api_key_value = None
+        if self.openai_api_key is not None:
+            if isinstance(self.openai_api_key, SecretStr):
+                api_key_value = self.openai_api_key.get_secret_value()
+            elif callable(self.openai_api_key):
+                api_key_value = self.openai_api_key()
+
         client_params: dict = {
-            "api_key": (
-                self.openai_api_key.get_secret_value() if self.openai_api_key else None
-            ),
+            "api_key": api_key_value,
             "organization": self.openai_organization,
             "base_url": self.openai_api_base,
             "timeout": self.request_timeout,

libs/partners/openai/langchain_openai/embeddings/base.py

@@ -4,7 +4,7 @@
 
 import logging
 import warnings
-from collections.abc import Iterable, Mapping, Sequence
+from collections.abc import Callable, Iterable, Mapping, Sequence
 from typing import Any, Literal, cast
 
 import openai
@@ -189,8 +189,11 @@ class OpenAIEmbeddings(BaseModel, Embeddings):
     )
     embedding_ctx_length: int = 8191
     """The maximum number of tokens to embed at once."""
-    openai_api_key: SecretStr | None = Field(
-        alias="api_key", default_factory=secret_from_env("OPENAI_API_KEY", default=None)
+    openai_api_key: SecretStr | None | Callable[[], str] = Field(
+        alias="api_key",
+        default_factory=secret_from_env(
+            ["OPENAI_API_KEY", "AZURE_OPENAI_API_KEY"], default=None
+        ),
     )
     """Automatically inferred from env var `OPENAI_API_KEY` if not provided."""
     openai_organization: str | None = Field(
@@ -292,10 +295,17 @@ def validate_environment(self) -> Self:
                 "If you are using Azure, please use the `AzureOpenAIEmbeddings` class."
             )
             raise ValueError(msg)
+
+        # Resolve API key from SecretStr or Callable
+        api_key_value = None
+        if self.openai_api_key is not None:
+            if isinstance(self.openai_api_key, SecretStr):
+                api_key_value = self.openai_api_key.get_secret_value()
+            elif callable(self.openai_api_key):
+                api_key_value = self.openai_api_key()
+
         client_params: dict = {
-            "api_key": (
-                self.openai_api_key.get_secret_value() if self.openai_api_key else None
-            ),
+            "api_key": api_key_value,
             "organization": self.openai_organization,
             "base_url": self.openai_api_base,
             "timeout": self.request_timeout,

libs/partners/openai/langchain_openai/llms/base.py

@@ -4,7 +4,7 @@
 
 import logging
 import sys
-from collections.abc import AsyncIterator, Collection, Iterator, Mapping
+from collections.abc import AsyncIterator, Callable, Collection, Iterator, Mapping
 from typing import Any, Literal
 
 import openai
@@ -186,8 +186,11 @@ class BaseOpenAI(BaseLLM):
     """Generates best_of completions server-side and returns the "best"."""
     model_kwargs: dict[str, Any] = Field(default_factory=dict)
     """Holds any model parameters valid for `create` call not explicitly specified."""
-    openai_api_key: SecretStr | None = Field(
-        alias="api_key", default_factory=secret_from_env("OPENAI_API_KEY", default=None)
+    openai_api_key: SecretStr | None | Callable[[], str] = Field(
+        alias="api_key",
+        default_factory=secret_from_env(
+            ["OPENAI_API_KEY", "AZURE_OPENAI_API_KEY"], default=None
+        ),
     )
     """Automatically inferred from env var `OPENAI_API_KEY` if not provided."""
     openai_api_base: str | None = Field(
@@ -276,10 +279,16 @@ def validate_environment(self) -> Self:
             msg = "Cannot stream results when best_of > 1."
             raise ValueError(msg)
 
+        # Resolve API key from SecretStr or Callable
+        api_key_value = None
+        if self.openai_api_key is not None:
+            if isinstance(self.openai_api_key, SecretStr):
+                api_key_value = self.openai_api_key.get_secret_value()
+            elif callable(self.openai_api_key):
+                api_key_value = self.openai_api_key()
+
         client_params: dict = {
-            "api_key": (
-                self.openai_api_key.get_secret_value() if self.openai_api_key else None
-            ),
+            "api_key": api_key_value,
             "organization": self.openai_organization,
             "base_url": self.openai_api_base,
             "timeout": self.request_timeout,

libs/partners/openai/tests/unit_tests/test_secrets.py

@@ -2,9 +2,6 @@
 
 import pytest
 from langchain_core.load import dumpd
-from pydantic import SecretStr
-from pytest import CaptureFixture, MonkeyPatch
-
 from langchain_openai import (
     AzureChatOpenAI,
     AzureOpenAI,
@@ -13,6 +10,8 @@
     OpenAI,
     OpenAIEmbeddings,
 )
+from pydantic import SecretStr
+from pytest import CaptureFixture, MonkeyPatch
 
 AZURE_AD_TOKEN = "secret-api-key"  # noqa: S105
 
@@ -187,6 +186,18 @@ def test_openai_uses_actual_secret_value_from_secretstr(model_class: type) -> No
     assert cast(SecretStr, model.openai_api_key).get_secret_value() == "secret-api-key"
 
 
+@pytest.mark.parametrize("model_class", [ChatOpenAI, OpenAI, OpenAIEmbeddings])
+def test_openai_api_key_accepts_callable(model_class: type) -> None:
+    """Test that the API key can be passed as a callable."""
+
+    def get_api_key() -> str:
+        return "secret-api-key-from-callable"
+
+    model = model_class(openai_api_key=get_api_key)
+    assert callable(model.openai_api_key)
+    assert model.openai_api_key() == "secret-api-key-from-callable"
+
+
 @pytest.mark.parametrize("model_class", [AzureChatOpenAI, AzureOpenAI])
 def test_azure_serialized_secrets(model_class: type) -> None:
     """Test that the actual secret value is correctly retrieved."""