github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-08-14 15:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

openai[patch]: Partially Revert Update openai chat model to new base class interface (#19871)

Browse Source 
Partially Reverts langchain-ai/langchain#19729

---------

Co-authored-by: Erick Friis <erick@langchain.dev>
This commit is contained in:
Nuno Campos 2024-04-01 10:31:06 -07:00 committed by GitHub
parent be92cf57ca
commit aa5797d908
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libs/partners/openai/langchain_openai/chat_models/base.py
View File

@ -34,7 +34,11 @@ from langchain_core.callbacks import (
CallbackManagerForLLMRun, CallbackManagerForLLMRun,
) )
from langchain_core.language_models import LanguageModelInput from langchain_core.language_models import LanguageModelInput
from langchain_core.language_models.chat_models import BaseChatModel from langchain_core.language_models.chat_models import (
BaseChatModel,
agenerate_from_stream,
generate_from_stream,
)
from langchain_core.messages import ( from langchain_core.messages import (
AIMessage, AIMessage,
AIMessageChunk, AIMessageChunk,
@ -474,6 +478,8 @@ class ChatOpenAI(BaseChatModel):
chunk = ChatGenerationChunk( chunk = ChatGenerationChunk(
message=chunk, generation_info=generation_info or None message=chunk, generation_info=generation_info or None
) )
if run_manager:
run_manager.on_llm_new_token(chunk.text, chunk=chunk, logprobs=logprobs)
yield chunk yield chunk
def _generate( def _generate(
@ -483,12 +489,13 @@ class ChatOpenAI(BaseChatModel):
run_manager: Optional[CallbackManagerForLLMRun] = None, run_manager: Optional[CallbackManagerForLLMRun] = None,
**kwargs: Any, **kwargs: Any,
) -> ChatResult: ) -> ChatResult:
if self.streaming:
stream_iter = self._stream(
messages, stop=stop, run_manager=run_manager, **kwargs
)
return generate_from_stream(stream_iter)
message_dicts, params = self._create_message_dicts(messages, stop) message_dicts, params = self._create_message_dicts(messages, stop)
params = { params = {**params, **kwargs}
**params,
**({"stream": self.streaming} if self.streaming else {}),
**kwargs,
}
response = self.client.create(messages=message_dicts, **params) response = self.client.create(messages=message_dicts, **params)
return self._create_chat_result(response) return self._create_chat_result(response)
@ -569,6 +576,10 @@ class ChatOpenAI(BaseChatModel):
chunk = ChatGenerationChunk( chunk = ChatGenerationChunk(
message=chunk, generation_info=generation_info or None message=chunk, generation_info=generation_info or None
) )
if run_manager:
await run_manager.on_llm_new_token(
token=chunk.text, chunk=chunk, logprobs=logprobs
)
yield chunk yield chunk
async def _agenerate( async def _agenerate(
@ -578,12 +589,14 @@ class ChatOpenAI(BaseChatModel):
run_manager: Optional[AsyncCallbackManagerForLLMRun] = None, run_manager: Optional[AsyncCallbackManagerForLLMRun] = None,
**kwargs: Any, **kwargs: Any,
) -> ChatResult: ) -> ChatResult:
if self.streaming:
stream_iter = self._astream(
messages, stop=stop, run_manager=run_manager, **kwargs
)
return await agenerate_from_stream(stream_iter)
message_dicts, params = self._create_message_dicts(messages, stop) message_dicts, params = self._create_message_dicts(messages, stop)
params = { params = {**params, **kwargs}
**params,
**({"stream": self.streaming} if self.streaming else {}),
**kwargs,
}
response = await self.async_client.create(messages=message_dicts, **params) response = await self.async_client.create(messages=message_dicts, **params)
return self._create_chat_result(response) return self._create_chat_result(response)