From 2709d3e5f2f8b8085f87434f44ba6ff095193c84 Mon Sep 17 00:00:00 2001 From: Leonid Ganeline Date: Wed, 17 Jan 2024 10:06:59 -0800 Subject: [PATCH] langchain[patch]: updated imports for `langchain.callbacks` (#16060) Updated imports from 'langchain` to `core` where it is possible --------- Co-authored-by: Bagatur --- libs/langchain/langchain/callbacks/base.py | 2 +- libs/langchain/langchain/callbacks/file.py | 3 +-- libs/langchain/langchain/callbacks/streaming_aiter.py | 3 +-- libs/langchain/langchain/callbacks/streaming_stdout.py | 2 +- .../langchain/callbacks/streaming_stdout_final_only.py | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/langchain/langchain/callbacks/base.py b/libs/langchain/langchain/callbacks/base.py index 9b9d189d3f6..7eaedce6fc8 100644 --- a/libs/langchain/langchain/callbacks/base.py +++ b/libs/langchain/langchain/callbacks/base.py @@ -1,7 +1,7 @@ """Base callback handler that can be used to handle callbacks in langchain.""" from __future__ import annotations -from langchain_core.callbacks.base import ( +from langchain_core.callbacks import ( AsyncCallbackHandler, BaseCallbackHandler, BaseCallbackManager, diff --git a/libs/langchain/langchain/callbacks/file.py b/libs/langchain/langchain/callbacks/file.py index 9768a9f0316..06bcecb027d 100644 --- a/libs/langchain/langchain/callbacks/file.py +++ b/libs/langchain/langchain/callbacks/file.py @@ -2,10 +2,9 @@ from typing import Any, Dict, Optional, TextIO, cast from langchain_core.agents import AgentAction, AgentFinish +from langchain_core.callbacks import BaseCallbackHandler from langchain_core.utils.input import print_text -from langchain.callbacks.base import BaseCallbackHandler - class FileCallbackHandler(BaseCallbackHandler): """Callback Handler that writes to a file.""" diff --git a/libs/langchain/langchain/callbacks/streaming_aiter.py b/libs/langchain/langchain/callbacks/streaming_aiter.py index 92218af87bb..2df5849db8f 100644 --- a/libs/langchain/langchain/callbacks/streaming_aiter.py +++ b/libs/langchain/langchain/callbacks/streaming_aiter.py @@ -3,10 +3,9 @@ from __future__ import annotations import asyncio from typing import Any, AsyncIterator, Dict, List, Literal, Union, cast +from langchain_core.callbacks import AsyncCallbackHandler from langchain_core.outputs import LLMResult -from langchain.callbacks.base import AsyncCallbackHandler - # TODO If used by two LLM runs in parallel this won't work as expected diff --git a/libs/langchain/langchain/callbacks/streaming_stdout.py b/libs/langchain/langchain/callbacks/streaming_stdout.py index e2a22232b57..1870f79210a 100644 --- a/libs/langchain/langchain/callbacks/streaming_stdout.py +++ b/libs/langchain/langchain/callbacks/streaming_stdout.py @@ -1,4 +1,4 @@ """Callback Handler streams to stdout on new llm token.""" -from langchain_core.callbacks.streaming_stdout import StreamingStdOutCallbackHandler +from langchain_core.callbacks import StreamingStdOutCallbackHandler __all__ = ["StreamingStdOutCallbackHandler"] diff --git a/libs/langchain/langchain/callbacks/streaming_stdout_final_only.py b/libs/langchain/langchain/callbacks/streaming_stdout_final_only.py index 6f3593d4d73..2dce9266a7b 100644 --- a/libs/langchain/langchain/callbacks/streaming_stdout_final_only.py +++ b/libs/langchain/langchain/callbacks/streaming_stdout_final_only.py @@ -2,7 +2,7 @@ import sys from typing import Any, Dict, List, Optional -from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler +from langchain_core.callbacks import StreamingStdOutCallbackHandler DEFAULT_ANSWER_PREFIX_TOKENS = ["Final", "Answer", ":"]