The agent engineering platform.
Python agentsaiai-agentsanthropicchatgptdeepagentsenterpriseframeworkgeminigenerative-ailangchainlanggraphllmmultiagentopen-sourceopenaipydanticpythonragtypescript
openai[patch]: use model_name in AzureOpenAI.ls_model_name (#24366)
Bagatur7d83189b198d
diff --git a/libs/partners/openai/langchain_openai/chat_models/azure.py b/libs/partners/openai/langchain_openai/chat_models/azure.pyindex 52ee57d3d4..2e6a5f7303 100644--- a/libs/partners/openai/langchain_openai/chat_models/azure.py+++ b/libs/partners/openai/langchain_openai/chat_models/azure.py@@ -95,6 +95,12 @@ class AzureChatOpenAI(BaseChatOpenAI):organization: Optional[str]OpenAI organization ID. If not passed in will be read from envvar OPENAI_ORG_ID.+ model: Optional[str]+ The name of the underlying OpenAI model. Used for tracing and token+ counting. Does not affect completion. E.g. "gpt-4", "gpt-35-turbo", etc.+ model_version: Optional[str]+ The version of the underlying OpenAI model. Used for tracing and token+ counting. Does not affect completion. E.g., "0125", "0125-preview", etc.See full list of supported init args and their descriptions in the params section.@@ -111,6 +117,8 @@ class AzureChatOpenAI(BaseChatOpenAI):timeout=None,max_retries=2,# organization="...",+ # model="gpt-35-turbo",+ # model_version="0125",# other params...)@@ -514,6 +522,13 @@ class AzureChatOpenAI(BaseChatOpenAI):azure_endpoint and update client params accordingly."""+ model_name: Optional[str] = Field(default=None, alias="model") # type: ignore[assignment]+ """Name of the deployed OpenAI model, e.g. "gpt-4o", "gpt-35-turbo", etc.++ Distinct from the Azure deployment name, which is set by the Azure user.+ Used for tracing and token counting. Does NOT affect completion.+ """+@classmethoddef get_lc_namespace(cls) -> List[str]:"""Get the namespace of the langchain object."""@@ -923,7 +938,14 @@ class AzureChatOpenAI(BaseChatOpenAI):"""Get the parameters used to invoke the model."""params = super()._get_ls_params(stop=stop, **kwargs)params["ls_provider"] = "azure"- if self.deployment_name:+ if self.model_name:+ if self.model_version and self.model_version not in self.model_name:+ params["ls_model_name"] = (+ self.model_name + "-" + self.model_version.lstrip("-")+ )+ else:+ params["ls_model_name"] = self.model_name+ elif self.deployment_name:params["ls_model_name"] = self.deployment_namereturn paramsdiff --git a/libs/partners/openai/tests/unit_tests/chat_models/test_azure.py b/libs/partners/openai/tests/unit_tests/chat_models/test_azure.pyindex 6c5d493933..601fb69cd5 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@@ -23,6 +23,8 @@ def test_initialize_more() -> None:azure_deployment="35-turbo-dev",openai_api_version="2023-05-15",temperature=0,+ model="gpt-35-turbo",+ model_version="0125",)assert llm.openai_api_key is not Noneassert llm.openai_api_key.get_secret_value() == "xyz"@@ -33,7 +35,7 @@ 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"+ assert ls_params["ls_model_name"] == "gpt-35-turbo-0125"def test_initialize_azure_openai_with_openai_api_base_set() -> None: