langchain[patch]: updated `retrievers` imports (#16062)

Updated imports into `langchain` to `core` where it is possible

---------

Co-authored-by: Bagatur <baskaryan@gmail.com>

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,
 )

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(

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):

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
 

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
 
 

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__)

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."""

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