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

openai[patch]: Update openai chat model to new base class interface #19729

Merged
merged 2 commits into from
Mar 29, 2024
Merged

openai[patch]: Update openai chat model to new base class interface #19729

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b72297
Update openai chat model to new base class interface
nfcampos Mar 28, 2024
4bb12e1
Lint
nfcampos Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 2 additions & 23 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 @@ -36,8 +36,8 @@
from langchain_core.language_models import LanguageModelInput
from langchain_core.language_models.chat_models import (
BaseChatModel,
agenerate_from_stream,

Check failure on line 39 in libs/partners/openai/langchain_openai/chat_models/base.py

View workflow job for this annotation

GitHub Actions / cd libs/partners/openai / make lint #3.8

Ruff (F401) 

langchain_openai/chat_models/base.py:39:5: F401 `langchain_core.language_models.chat_models.agenerate_from_stream` imported but unused

Check failure on line 39 in libs/partners/openai/langchain_openai/chat_models/base.py

View workflow job for this annotation

GitHub Actions / cd libs/partners/openai / make lint #3.11

Ruff (F401) 

langchain_openai/chat_models/base.py:39:5: F401 `langchain_core.language_models.chat_models.agenerate_from_stream` imported but unused
generate_from_stream,

Check failure on line 40 in libs/partners/openai/langchain_openai/chat_models/base.py

View workflow job for this annotation

GitHub Actions / cd libs/partners/openai / make lint #3.8

Ruff (F401) 

langchain_openai/chat_models/base.py:40:5: F401 `langchain_core.language_models.chat_models.generate_from_stream` imported but unused

Check failure on line 40 in libs/partners/openai/langchain_openai/chat_models/base.py

View workflow job for this annotation

GitHub Actions / cd libs/partners/openai / make lint #3.11

Ruff (F401) 

langchain_openai/chat_models/base.py:40:5: F401 `langchain_core.language_models.chat_models.generate_from_stream` imported but unused
)
from langchain_core.messages import (
AIMessage,
Expand Down Expand Up @@ -476,28 +476,19 @@
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(
self,
messages: List[BaseMessage],
stop: Optional[List[str]] = None,
run_manager: Optional[CallbackManagerForLLMRun] = None,
stream: Optional[bool] = None,
**kwargs: Any,
) -> ChatResult:
should_stream = stream if stream is not None else self.streaming
if should_stream:
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": stream} if stream is not None else {}),
**({"stream": self.streaming} if self.streaming else {}),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and just confirming - this will not be called if I call chat.generate(stream=True) because that will call ._stream instead

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep

**kwargs,
}
response = self.client.create(messages=message_dicts, **params)
Expand Down Expand Up @@ -570,31 +561,19 @@
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(
self,
messages: List[BaseMessage],
stop: Optional[List[str]] = None,
run_manager: Optional[AsyncCallbackManagerForLLMRun] = None,
stream: Optional[bool] = None,
**kwargs: Any,
) -> ChatResult:
should_stream = stream if stream is not None else self.streaming
if should_stream:
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": stream} if stream is not None else {}),
**({"stream": self.streaming} if self.streaming else {}),
**kwargs,
}
response = await self.async_client.create(messages=message_dicts, **params)
Expand Down
Loading