diff --git a/libs/langchain/langchain/retrievers/contextual_compression.py b/libs/langchain/langchain/retrievers/contextual_compression.py index d06a9b69083..b41a82a2b41 100644 --- a/libs/langchain/langchain/retrievers/contextual_compression.py +++ b/libs/langchain/langchain/retrievers/contextual_compression.py @@ -1,12 +1,12 @@ from typing import Any, List -from langchain_core.documents import Document -from langchain_core.retrievers import BaseRetriever - -from langchain.callbacks.manager import ( +from langchain_core.callbacks import ( AsyncCallbackManagerForRetrieverRun, CallbackManagerForRetrieverRun, ) +from langchain_core.documents import Document +from langchain_core.retrievers import BaseRetriever + from langchain.retrievers.document_compressors.base import ( BaseDocumentCompressor, ) diff --git a/libs/langchain/langchain/retrievers/ensemble.py b/libs/langchain/langchain/retrievers/ensemble.py index 324ede8ae27..050cb88fc4c 100644 --- a/libs/langchain/langchain/retrievers/ensemble.py +++ b/libs/langchain/langchain/retrievers/ensemble.py @@ -5,6 +5,10 @@ multiple retrievers by using weighted Reciprocal Rank Fusion import asyncio from typing import Any, Dict, List, Optional +from langchain_core.callbacks import ( + AsyncCallbackManagerForRetrieverRun, + CallbackManagerForRetrieverRun, +) from langchain_core.documents import Document from langchain_core.load.dump import dumpd from langchain_core.pydantic_v1 import root_validator @@ -16,11 +20,6 @@ from langchain_core.runnables.utils import ( get_unique_config_specs, ) -from langchain.callbacks.manager import ( - AsyncCallbackManagerForRetrieverRun, - CallbackManagerForRetrieverRun, -) - class EnsembleRetriever(BaseRetriever): """Retriever that ensembles the multiple retrievers. @@ -57,7 +56,7 @@ class EnsembleRetriever(BaseRetriever): def invoke( self, input: str, config: Optional[RunnableConfig] = None, **kwargs: Any ) -> List[Document]: - from langchain_core.callbacks.manager import CallbackManager + from langchain_core.callbacks import CallbackManager config = ensure_config(config) callback_manager = CallbackManager.configure( @@ -90,7 +89,7 @@ class EnsembleRetriever(BaseRetriever): async def ainvoke( self, input: str, config: Optional[RunnableConfig] = None, **kwargs: Any ) -> List[Document]: - from langchain_core.callbacks.manager import AsyncCallbackManager + from langchain_core.callbacks import AsyncCallbackManager config = ensure_config(config) callback_manager = AsyncCallbackManager.configure( diff --git a/libs/langchain/langchain/retrievers/merger_retriever.py b/libs/langchain/langchain/retrievers/merger_retriever.py index ab3124a6a7b..f5326773bcb 100644 --- a/libs/langchain/langchain/retrievers/merger_retriever.py +++ b/libs/langchain/langchain/retrievers/merger_retriever.py @@ -1,13 +1,12 @@ import asyncio from typing import List -from langchain_core.documents import Document -from langchain_core.retrievers import BaseRetriever - -from langchain.callbacks.manager import ( +from langchain_core.callbacks import ( AsyncCallbackManagerForRetrieverRun, CallbackManagerForRetrieverRun, ) +from langchain_core.documents import Document +from langchain_core.retrievers import BaseRetriever class MergerRetriever(BaseRetriever): diff --git a/libs/langchain/langchain/retrievers/multi_query.py b/libs/langchain/langchain/retrievers/multi_query.py index e3160bb752a..7d60b221514 100644 --- a/libs/langchain/langchain/retrievers/multi_query.py +++ b/libs/langchain/langchain/retrievers/multi_query.py @@ -2,16 +2,16 @@ import asyncio import logging from typing import List, Sequence +from langchain_core.callbacks import ( + AsyncCallbackManagerForRetrieverRun, + CallbackManagerForRetrieverRun, +) from langchain_core.documents import Document from langchain_core.language_models import BaseLLM from langchain_core.prompts.prompt import PromptTemplate from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.retrievers import BaseRetriever -from langchain.callbacks.manager import ( - AsyncCallbackManagerForRetrieverRun, - CallbackManagerForRetrieverRun, -) from langchain.chains.llm import LLMChain from langchain.output_parsers.pydantic import PydanticOutputParser diff --git a/libs/langchain/langchain/retrievers/multi_vector.py b/libs/langchain/langchain/retrievers/multi_vector.py index bfb21af80ce..167fc5d4cb8 100644 --- a/libs/langchain/langchain/retrievers/multi_vector.py +++ b/libs/langchain/langchain/retrievers/multi_vector.py @@ -1,13 +1,13 @@ from enum import Enum from typing import Dict, List, Optional +from langchain_core.callbacks import CallbackManagerForRetrieverRun from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field, root_validator from langchain_core.retrievers import BaseRetriever from langchain_core.stores import BaseStore, ByteStore from langchain_core.vectorstores import VectorStore -from langchain.callbacks.manager import CallbackManagerForRetrieverRun from langchain.storage._lc_store import create_kv_docstore diff --git a/libs/langchain/langchain/retrievers/re_phraser.py b/libs/langchain/langchain/retrievers/re_phraser.py index e4611b202f4..2ffdd45e3ee 100644 --- a/libs/langchain/langchain/retrievers/re_phraser.py +++ b/libs/langchain/langchain/retrievers/re_phraser.py @@ -1,15 +1,15 @@ import logging from typing import List +from langchain_core.callbacks import ( + AsyncCallbackManagerForRetrieverRun, + CallbackManagerForRetrieverRun, +) from langchain_core.documents import Document from langchain_core.language_models import BaseLLM from langchain_core.prompts.prompt import PromptTemplate from langchain_core.retrievers import BaseRetriever -from langchain.callbacks.manager import ( - AsyncCallbackManagerForRetrieverRun, - CallbackManagerForRetrieverRun, -) from langchain.chains.llm import LLMChain logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/retrievers/time_weighted_retriever.py b/libs/langchain/langchain/retrievers/time_weighted_retriever.py index 273839984d8..33d553a3cae 100644 --- a/libs/langchain/langchain/retrievers/time_weighted_retriever.py +++ b/libs/langchain/langchain/retrievers/time_weighted_retriever.py @@ -2,13 +2,12 @@ import datetime from copy import deepcopy from typing import Any, Dict, List, Optional, Tuple +from langchain_core.callbacks import CallbackManagerForRetrieverRun from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field from langchain_core.retrievers import BaseRetriever from langchain_core.vectorstores import VectorStore -from langchain.callbacks.manager import CallbackManagerForRetrieverRun - def _get_hours_passed(time: datetime.datetime, ref_time: datetime.datetime) -> float: """Get the hours passed between two datetimes.""" diff --git a/libs/langchain/langchain/retrievers/web_research.py b/libs/langchain/langchain/retrievers/web_research.py index 92d790cc858..149ef247af7 100644 --- a/libs/langchain/langchain/retrievers/web_research.py +++ b/libs/langchain/langchain/retrievers/web_research.py @@ -6,6 +6,10 @@ from langchain_community.document_loaders import AsyncHtmlLoader from langchain_community.document_transformers import Html2TextTransformer from langchain_community.llms import LlamaCpp from langchain_community.utilities import GoogleSearchAPIWrapper +from langchain_core.callbacks import ( + AsyncCallbackManagerForRetrieverRun, + CallbackManagerForRetrieverRun, +) from langchain_core.documents import Document from langchain_core.language_models import BaseLLM from langchain_core.prompts import BasePromptTemplate, PromptTemplate @@ -13,10 +17,6 @@ from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.retrievers import BaseRetriever from langchain_core.vectorstores import VectorStore -from langchain.callbacks.manager import ( - AsyncCallbackManagerForRetrieverRun, - CallbackManagerForRetrieverRun, -) from langchain.chains import LLMChain from langchain.chains.prompt_selector import ConditionalPromptSelector from langchain.output_parsers.pydantic import PydanticOutputParser