langchain 0.2.15__py3-none-any.whl → 0.3.0__py3-none-any.whl

langchain/retrievers/ensemble.py

@@ -24,8 +24,6 @@ from langchain_core.callbacks import (
     CallbackManagerForRetrieverRun,
 )
 from langchain_core.documents import Document
-from langchain_core.load.dump import dumpd
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.retrievers import BaseRetriever, RetrieverLike
 from langchain_core.runnables import RunnableConfig
 from langchain_core.runnables.config import ensure_config, patch_config
@@ -33,6 +31,7 @@ from langchain_core.runnables.utils import (
     ConfigurableFieldSpec,
     get_unique_config_specs,
 )
+from pydantic import model_validator
 
 T = TypeVar("T")
 H = TypeVar("H", bound=Hashable)
@@ -83,8 +82,9 @@ class EnsembleRetriever(BaseRetriever):
             spec for retriever in self.retrievers for spec in retriever.config_specs
         )
 
-    @root_validator(pre=True)
-    def set_weights(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+    @model_validator(mode="before")
+    @classmethod
+    def set_weights(cls, values: Dict[str, Any]) -> Any:
         if not values.get("weights"):
             n_retrievers = len(values["retrievers"])
             values["weights"] = [1 / n_retrievers] * n_retrievers
@@ -106,9 +106,9 @@ class EnsembleRetriever(BaseRetriever):
             local_metadata=self.metadata,
         )
         run_manager = callback_manager.on_retriever_start(
-            dumpd(self),
+            None,
             input,
-            name=config.get("run_name"),
+            name=config.get("run_name") or self.get_name(),
             **kwargs,
         )
         try:
@@ -139,9 +139,9 @@ class EnsembleRetriever(BaseRetriever):
             local_metadata=self.metadata,
         )
         run_manager = await callback_manager.on_retriever_start(
-            dumpd(self),
+            None,
             input,
-            name=config.get("run_name"),
+            name=config.get("run_name") or self.get_name(),
             **kwargs,
         )
         try:
@@ -310,9 +310,11 @@ class EnsembleRetriever(BaseRetriever):
         for doc_list, weight in zip(doc_lists, self.weights):
             for rank, doc in enumerate(doc_list, start=1):
                 rrf_score[
-                    doc.page_content
-                    if self.id_key is None
-                    else doc.metadata[self.id_key]
+                    (
+                        doc.page_content
+                        if self.id_key is None
+                        else doc.metadata[self.id_key]
+                    )
                 ] += weight / (rank + self.c)
 
         # Docs are deduplicated by their contents then sorted by their scores
@@ -320,9 +322,11 @@ class EnsembleRetriever(BaseRetriever):
         sorted_docs = sorted(
             unique_by_key(
                 all_docs,
-                lambda doc: doc.page_content
-                if self.id_key is None
-                else doc.metadata[self.id_key],
+                lambda doc: (
+                    doc.page_content
+                    if self.id_key is None
+                    else doc.metadata[self.id_key]
+                ),
             ),
             reverse=True,
             key=lambda doc: rrf_score[

langchain/retrievers/multi_vector.py

@@ -1,15 +1,15 @@
 from enum import Enum
-from typing import Dict, List, Optional
+from typing import Any, Dict, List, Optional
 
 from langchain_core.callbacks import (
     AsyncCallbackManagerForRetrieverRun,
     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 pydantic import Field, model_validator
 
 from langchain.storage._lc_store import create_kv_docstore
 
@@ -41,8 +41,9 @@ class MultiVectorRetriever(BaseRetriever):
     search_type: SearchType = SearchType.similarity
     """Type of search to perform (similarity / mmr)"""
 
-    @root_validator(pre=True)
-    def shim_docstore(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def shim_docstore(cls, values: Dict) -> Any:
         byte_store = values.get("byte_store")
         docstore = values.get("docstore")
         if byte_store is not None:

langchain/retrievers/self_query/base.py

@@ -9,11 +9,11 @@ from langchain_core.callbacks.manager import (
 )
 from langchain_core.documents import Document
 from langchain_core.language_models import BaseLanguageModel
-from langchain_core.pydantic_v1 import Field, root_validator
 from langchain_core.retrievers import BaseRetriever
 from langchain_core.runnables import Runnable
 from langchain_core.structured_query import StructuredQuery, Visitor
 from langchain_core.vectorstores import VectorStore
+from pydantic import ConfigDict, Field, model_validator
 
 from langchain.chains.query_constructor.base import load_query_constructor_runnable
 from langchain.chains.query_constructor.schema import AttributeInfo
@@ -48,6 +48,7 @@ def _get_builtin_translator(vectorstore: VectorStore) -> Visitor:
         MongoDBAtlasTranslator,
     )
     from langchain_community.query_constructors.myscale import MyScaleTranslator
+    from langchain_community.query_constructors.neo4j import Neo4jTranslator
     from langchain_community.query_constructors.opensearch import OpenSearchTranslator
     from langchain_community.query_constructors.pgvector import PGVectorTranslator
     from langchain_community.query_constructors.pinecone import PineconeTranslator
@@ -70,6 +71,7 @@ def _get_builtin_translator(vectorstore: VectorStore) -> Visitor:
         Dingo,
         Milvus,
         MyScale,
+        Neo4jVector,
         OpenSearchVectorSearch,
         PGVector,
         Qdrant,
@@ -111,11 +113,10 @@ def _get_builtin_translator(vectorstore: VectorStore) -> Visitor:
         TimescaleVector: TimescaleVectorTranslator,
         OpenSearchVectorSearch: OpenSearchTranslator,
         CommunityMongoDBAtlasVectorSearch: MongoDBAtlasTranslator,
+        Neo4jVector: Neo4jTranslator,
     }
     if isinstance(vectorstore, DatabricksVectorSearch):
         return DatabricksVectorSearchTranslator()
-    if isinstance(vectorstore, Qdrant):
-        return QdrantTranslator(metadata_key=vectorstore.metadata_payload_key)
     elif isinstance(vectorstore, MyScale):
         return MyScaleTranslator(metadata_key=vectorstore.metadata_column)
     elif isinstance(vectorstore, Redis):
@@ -177,6 +178,14 @@ def _get_builtin_translator(vectorstore: VectorStore) -> Visitor:
             if isinstance(vectorstore, PGVector):
                 return NewPGVectorTranslator()
 
+        try:
+            from langchain_qdrant import QdrantVectorStore
+        except ImportError:
+            pass
+        else:
+            if isinstance(vectorstore, QdrantVectorStore):
+                return QdrantTranslator(metadata_key=vectorstore.metadata_payload_key)
+
         try:
             # Added in langchain-community==0.2.11
             from langchain_community.query_constructors.hanavector import HanaTranslator
@@ -214,12 +223,14 @@ class SelfQueryRetriever(BaseRetriever):
     use_original_query: bool = False
     """Use original query instead of the revised new query from LLM"""
 
-    class Config:
-        allow_population_by_field_name = True
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        populate_by_name=True,
+        arbitrary_types_allowed=True,
+    )
 
-    @root_validator(pre=True)
-    def validate_translator(cls, values: Dict) -> Dict:
+    @model_validator(mode="before")
+    @classmethod
+    def validate_translator(cls, values: Dict) -> Any:
         """Validate translator."""
         if "structured_query_translator" not in values:
             values["structured_query_translator"] = _get_builtin_translator(

langchain/retrievers/time_weighted_retriever.py

@@ -7,9 +7,9 @@ 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 pydantic import ConfigDict, Field
 
 
 def _get_hours_passed(time: datetime.datetime, ref_time: datetime.datetime) -> float:
@@ -46,8 +46,9 @@ class TimeWeightedVectorStoreRetriever(BaseRetriever):
     None assigns no salience to documents not fetched from the vector store.
     """
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     def _document_get_date(self, field: str, document: Document) -> datetime.datetime:
         """Return the value of the date field of a document."""

langchain/smith/evaluation/config.py

@@ -5,10 +5,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Union
 from langchain_core.embeddings import Embeddings
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import BasePromptTemplate
-from langchain_core.pydantic_v1 import BaseModel, Field
 from langsmith import RunEvaluator
 from langsmith.evaluation.evaluator import EvaluationResult, EvaluationResults
 from langsmith.schemas import Example, Run
+from pydantic import BaseModel, ConfigDict, Field
 
 from langchain.evaluation.criteria.eval_chain import CRITERIA_TYPE
 from langchain.evaluation.embedding_distance.base import (
@@ -156,8 +156,9 @@ class RunEvalConfig(BaseModel):
     eval_llm: Optional[BaseLanguageModel] = None
     """The language model to pass to any evaluators that require one."""
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
 
     class Criteria(SingleKeyEvalConfig):
         """Configuration for a reference-free criteria evaluator.
@@ -217,8 +218,9 @@ class RunEvalConfig(BaseModel):
         embeddings: Optional[Embeddings] = None
         distance_metric: Optional[EmbeddingDistanceEnum] = None
 
-        class Config:
-            arbitrary_types_allowed = True
+        model_config = ConfigDict(
+            arbitrary_types_allowed=True,
+        )
 
     class StringDistance(SingleKeyEvalConfig):
         """Configuration for a string distance evaluator.

{langchain-0.2.15.dist-info → langchain-0.3.0.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: langchain
-Version: 0.2.15
+Version: 0.3.0
 Summary: Building applications with LLMs through composability
 Home-page: https://github.com/langchain-ai/langchain
 License: MIT
-Requires-Python: >=3.8.1,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -15,12 +15,12 @@ Requires-Dist: PyYAML (>=5.3)
 Requires-Dist: SQLAlchemy (>=1.4,<3)
 Requires-Dist: aiohttp (>=3.8.3,<4.0.0)
 Requires-Dist: async-timeout (>=4.0.0,<5.0.0) ; python_version < "3.11"
-Requires-Dist: langchain-core (>=0.2.35,<0.3.0)
-Requires-Dist: langchain-text-splitters (>=0.2.0,<0.3.0)
+Requires-Dist: langchain-core (>=0.3.0,<0.4.0)
+Requires-Dist: langchain-text-splitters (>=0.3.0,<0.4.0)
 Requires-Dist: langsmith (>=0.1.17,<0.2.0)
 Requires-Dist: numpy (>=1,<2) ; python_version < "3.12"
 Requires-Dist: numpy (>=1.26.0,<2.0.0) ; python_version >= "3.12"
-Requires-Dist: pydantic (>=1,<3)
+Requires-Dist: pydantic (>=2.7.4,<3.0.0)
 Requires-Dist: requests (>=2,<3)
 Requires-Dist: tenacity (>=8.1.0,<9.0.0,!=8.4.0)
 Project-URL: Repository, https://github.com/langchain-ai/langchain