klas/t6_mem0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Azure OpenAI Deprecations and Adjusted the Tests (#1437)

Browse Source
This commit is contained in:
Halan Marques
2024-06-24 10:55:38 -07:00
committed by GitHub
parent 18fb92f1f8
commit 8700165b42
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
embedchain/embedder/openai.py
View File

@@ -2,7 +2,7 @@ import os
from typing import Optional from typing import Optional
from chromadb.utils.embedding_functions import OpenAIEmbeddingFunction from chromadb.utils.embedding_functions import OpenAIEmbeddingFunction
from langchain_community.embeddings import AzureOpenAIEmbeddings from langchain_openai.embeddings import AzureOpenAIEmbeddings
from embedchain.config import BaseEmbedderConfig from embedchain.config import BaseEmbedderConfig
from embedchain.embedder.base import BaseEmbedder from embedchain.embedder.base import BaseEmbedder

8
embedchain/llm/azure_openai.py
View File

@@ -14,18 +14,18 @@ class AzureOpenAILlm(BaseLlm):
super().__init__(config=config) super().__init__(config=config)
def get_llm_model_answer(self, prompt): def get_llm_model_answer(self, prompt):
return AzureOpenAILlm._get_answer(prompt=prompt, config=self.config) return self._get_answer(prompt=prompt, config=self.config)
@staticmethod @staticmethod
def _get_answer(prompt: str, config: BaseLlmConfig) -> str: def _get_answer(prompt: str, config: BaseLlmConfig) -> str:
from langchain_community.chat_models import AzureChatOpenAI from langchain_openai import AzureChatOpenAI
if not config.deployment_name: if not config.deployment_name:
raise ValueError("Deployment name must be provided for Azure OpenAI") raise ValueError("Deployment name must be provided for Azure OpenAI")
chat = AzureChatOpenAI( chat = AzureChatOpenAI(
deployment_name=config.deployment_name, deployment_name=config.deployment_name,
openai_api_version=str(config.api_version) if config.api_version else "2023-05-15", openai_api_version=str(config.api_version) if config.api_version else "2024-02-01",
model_name=config.model or "gpt-3.5-turbo", model_name=config.model or "gpt-3.5-turbo",
temperature=config.temperature, temperature=config.temperature,
max_tokens=config.max_tokens, max_tokens=config.max_tokens,
@@ -37,4 +37,4 @@ class AzureOpenAILlm(BaseLlm):
messages = BaseLlm._get_messages(prompt, system_prompt=config.system_prompt) messages = BaseLlm._get_messages(prompt, system_prompt=config.system_prompt)
return chat(messages).content return chat.invoke(messages).content

13
tests/llm/test_azure_openai.py
View File

@@ -28,9 +28,9 @@ def test_get_llm_model_answer(azure_openai_llm):
def test_get_answer(azure_openai_llm): def test_get_answer(azure_openai_llm):
with patch("langchain_community.chat_models.AzureChatOpenAI") as mock_chat: with patch("langchain_openai.AzureChatOpenAI") as mock_chat:
mock_chat_instance = mock_chat.return_value mock_chat_instance = mock_chat.return_value
mock_chat_instance.return_value = MagicMock(content="Test Response") mock_chat_instance.invoke.return_value = MagicMock(content="Test Response")
prompt = "Test Prompt" prompt = "Test Prompt"
response = azure_openai_llm._get_answer(prompt, azure_openai_llm.config) response = azure_openai_llm._get_answer(prompt, azure_openai_llm.config)
@@ -38,15 +38,12 @@ def test_get_answer(azure_openai_llm):
assert response == "Test Response" assert response == "Test Response"
mock_chat.assert_called_once_with( mock_chat.assert_called_once_with(
deployment_name=azure_openai_llm.config.deployment_name, deployment_name=azure_openai_llm.config.deployment_name,
openai_api_version="2023-05-15", openai_api_version="2024-02-01",
model_name=azure_openai_llm.config.model or "gpt-3.5-turbo", model_name=azure_openai_llm.config.model or "gpt-3.5-turbo",
temperature=azure_openai_llm.config.temperature, temperature=azure_openai_llm.config.temperature,
max_tokens=azure_openai_llm.config.max_tokens, max_tokens=azure_openai_llm.config.max_tokens,
streaming=azure_openai_llm.config.stream, streaming=azure_openai_llm.config.stream,
) )
mock_chat_instance.assert_called_once_with(
azure_openai_llm._get_messages(prompt, system_prompt=azure_openai_llm.config.system_prompt)
)
def test_get_messages(azure_openai_llm): def test_get_messages(azure_openai_llm):
@@ -65,6 +62,7 @@ def test_when_no_deployment_name_provided():
llm = AzureOpenAILlm(config) llm = AzureOpenAILlm(config)
llm.get_llm_model_answer("Test Prompt") llm.get_llm_model_answer("Test Prompt")
def test_with_api_version(): def test_with_api_version():
config = BaseLlmConfig( config = BaseLlmConfig(
deployment_name="azure_deployment", deployment_name="azure_deployment",
@@ -75,8 +73,7 @@ def test_with_api_version():
api_version="2024-02-01", api_version="2024-02-01",
) )
with patch("langchain_community.chat_models.AzureChatOpenAI") as mock_chat: with patch("langchain_openai.AzureChatOpenAI") as mock_chat:
llm = AzureOpenAILlm(config) llm = AzureOpenAILlm(config)
llm.get_llm_model_answer("Test Prompt") llm.get_llm_model_answer("Test Prompt")