Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Apr 1, 2024
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e276170
Revert "openai[patch]: Update openai chat model to new base class int…
nfcampos Apr 1, 2024
606f95e
Fix
nfcampos Apr 1, 2024
3a94946
Merge branch 'master' into revert-19729-nc/28mar/openai-chat-update
efriis Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 24 additions & 11 deletions libs/partners/openai/langchain_openai/chat_models/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
CallbackManagerForLLMRun,
)
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 (
AIMessage,
AIMessageChunk,
Expand Down Expand Up @@ -474,6 +478,8 @@ def _stream(
chunk = ChatGenerationChunk(
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

def _generate(
Expand All @@ -483,12 +489,13 @@ def _generate(
run_manager: Optional[CallbackManagerForLLMRun] = None,
**kwargs: Any,
) -> 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)
params = {
**params,
**({"stream": self.streaming} if self.streaming else {}),
**kwargs,
}
params = {**params, **kwargs}
response = self.client.create(messages=message_dicts, **params)
return self._create_chat_result(response)

Expand Down Expand Up @@ -569,6 +576,10 @@ async def _astream(
chunk = ChatGenerationChunk(
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

async def _agenerate(
Expand All @@ -578,12 +589,14 @@ async def _agenerate(
run_manager: Optional[AsyncCallbackManagerForLLMRun] = None,
**kwargs: Any,
) -> 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)
params = {
**params,
**({"stream": self.streaming} if self.streaming else {}),
**kwargs,
}
params = {**params, **kwargs}
response = await self.async_client.create(messages=message_dicts, **params)
return self._create_chat_result(response)

Expand Down