langchain 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

langchain/retrievers/ensemble.py

@@ -2,6 +2,7 @@
 Ensemble retriever that ensemble the results of
 multiple retrievers by using weighted  Reciprocal Rank Fusion
 """
+
 import asyncio
 from collections import defaultdict
 from collections.abc import Hashable
@@ -66,11 +67,14 @@ class EnsembleRetriever(BaseRetriever):
         c: A constant added to the rank, controlling the balance between the importance
             of high-ranked items and the consideration given to lower-ranked items.
             Default is 60.
+        id_key: The key in the document's metadata used to determine unique documents.
+            If not specified, page_content is used.
     """
 
     retrievers: List[RetrieverLike]
     weights: List[float]
     c: int = 60
+    id_key: Optional[str] = None
 
     @property
     def config_specs(self) -> List[ConfigurableFieldSpec]:
@@ -305,13 +309,24 @@ class EnsembleRetriever(BaseRetriever):
         rrf_score: Dict[str, float] = defaultdict(float)
         for doc_list, weight in zip(doc_lists, self.weights):
             for rank, doc in enumerate(doc_list, start=1):
-                rrf_score[doc.page_content] += weight / (rank + self.c)
+                rrf_score[
+                    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
         all_docs = chain.from_iterable(doc_lists)
         sorted_docs = sorted(
-            unique_by_key(all_docs, lambda doc: doc.page_content),
+            unique_by_key(
+                all_docs,
+                lambda doc: doc.page_content
+                if self.id_key is None
+                else doc.metadata[self.id_key],
+            ),
             reverse=True,
-            key=lambda doc: rrf_score[doc.page_content],
+            key=lambda doc: rrf_score[
+                doc.page_content if self.id_key is None else doc.metadata[self.id_key]
+            ],
         )
         return sorted_docs

langchain/retrievers/multi_query.py

@@ -9,6 +9,7 @@ from langchain_core.callbacks import (
 from langchain_core.documents import Document
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.output_parsers import BaseOutputParser
+from langchain_core.prompts import BasePromptTemplate
 from langchain_core.prompts.prompt import PromptTemplate
 from langchain_core.retrievers import BaseRetriever
 from langchain_core.runnables import Runnable
@@ -62,7 +63,7 @@ class MultiQueryRetriever(BaseRetriever):
         cls,
         retriever: BaseRetriever,
         llm: BaseLanguageModel,
-        prompt: PromptTemplate = DEFAULT_QUERY_PROMPT,
+        prompt: BasePromptTemplate = DEFAULT_QUERY_PROMPT,
         parser_key: Optional[str] = None,
         include_original: bool = False,
     ) -> "MultiQueryRetriever":

langchain/retrievers/re_phraser.py

@@ -7,6 +7,7 @@ from langchain_core.callbacks import (
 )
 from langchain_core.documents import Document
 from langchain_core.language_models import BaseLLM
+from langchain_core.prompts import BasePromptTemplate
 from langchain_core.prompts.prompt import PromptTemplate
 from langchain_core.retrievers import BaseRetriever
 
@@ -36,7 +37,7 @@ class RePhraseQueryRetriever(BaseRetriever):
         cls,
         retriever: BaseRetriever,
         llm: BaseLLM,
-        prompt: PromptTemplate = DEFAULT_QUERY_PROMPT,
+        prompt: BasePromptTemplate = DEFAULT_QUERY_PROMPT,
     ) -> "RePhraseQueryRetriever":
         """Initialize from llm using default template.
 

langchain/retrievers/self_query/base.py

@@ -169,12 +169,13 @@ def _get_builtin_translator(vectorstore: VectorStore) -> Visitor:
                 return ChromaTranslator()
 
         try:
-            from langchain_postgres import PGVector
+            from langchain_postgres import PGVector  # type: ignore[no-redef]
+            from langchain_postgres import PGVectorTranslator as NewPGVectorTranslator
         except ImportError:
             pass
         else:
             if isinstance(vectorstore, PGVector):
-                return PGVectorTranslator()
+                return NewPGVectorTranslator()
 
         raise ValueError(
             f"Self query retriever with Vector Store type {vectorstore.__class__}"
@@ -309,16 +310,16 @@ class SelfQueryRetriever(BaseRetriever):
             "allowed_comparators" not in chain_kwargs
             and structured_query_translator.allowed_comparators is not None
         ):
-            chain_kwargs[
-                "allowed_comparators"
-            ] = structured_query_translator.allowed_comparators
+            chain_kwargs["allowed_comparators"] = (
+                structured_query_translator.allowed_comparators
+            )
         if (
             "allowed_operators" not in chain_kwargs
             and structured_query_translator.allowed_operators is not None
         ):
-            chain_kwargs[
-                "allowed_operators"
-            ] = structured_query_translator.allowed_operators
+            chain_kwargs["allowed_operators"] = (
+                structured_query_translator.allowed_operators
+            )
         query_constructor = load_query_constructor_runnable(
             llm,
             document_contents,

langchain/schema/__init__.py

@@ -1,4 +1,5 @@
 """**Schemas** are the LangChain Base Classes and Interfaces."""
+
 from langchain_core.agents import AgentAction, AgentFinish
 from langchain_core.caches import BaseCache
 from langchain_core.chat_history import BaseChatMessageHistory

langchain/schema/runnable/__init__.py

@@ -14,6 +14,7 @@ creating more responsive UX.
 
 This module contains schema and implementation of LangChain Runnables primitives.
 """
+
 from langchain_core.runnables.base import (
     Runnable,
     RunnableBinding,

langchain/serpapi.py

@@ -1,4 +1,5 @@
 """For backwards compatibility."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/smith/__init__.py

@@ -54,19 +54,19 @@ or LangSmith's `RunEvaluator` classes.
     from langchain.evaluation import StringEvaluator
 
     class MyStringEvaluator(StringEvaluator):
-        
+
         @property
         def requires_input(self) -> bool:
             return False
-        
+
         @property
         def requires_reference(self) -> bool:
             return True
-        
+
         @property
         def evaluation_name(self) -> str:
             return "exact_match"
-        
+
         def _evaluate_strings(self, prediction, reference=None, input=None, **kwargs) -> dict:
             return {"score": prediction == reference}
 
@@ -80,7 +80,7 @@ or LangSmith's `RunEvaluator` classes.
         "<my_dataset_name>",
         construct_chain,
         evaluation=evaluation_config,
-    )    
+    )
 
 **Primary Functions**
 
@@ -88,6 +88,7 @@ or LangSmith's `RunEvaluator` classes.
 - :func:`run_on_dataset <langchain.smith.evaluation.runner_utils.run_on_dataset>`: Function to evaluate a chain, agent, or other LangChain component over a dataset.
 - :class:`RunEvalConfig <langchain.smith.evaluation.config.RunEvalConfig>`: Class representing the configuration for running evaluation. You can select evaluators by :class:`EvaluatorType <langchain.evaluation.schema.EvaluatorType>` or config, or you can pass in `custom_evaluators`
 """  # noqa: E501
+
 from langchain.smith.evaluation import (
     RunEvalConfig,
     arun_on_dataset,

langchain/smith/evaluation/__init__.py

@@ -51,7 +51,6 @@ For more information on the LangSmith API, see the `LangSmith API documentation
 
 """  # noqa: E501
 
-
 from langchain.smith.evaluation.config import RunEvalConfig
 from langchain.smith.evaluation.runner_utils import (
     InputFormatError,

langchain/smith/evaluation/string_run_evaluator.py

@@ -1,4 +1,5 @@
 """Run evaluator wrapper for string evaluators."""
+
 from __future__ import annotations
 
 from abc import abstractmethod

langchain/sql_database.py

@@ -1,4 +1,5 @@
 """Keep here for backwards compatibility."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/storage/__init__.py

@@ -5,6 +5,7 @@ to a simple key-value interface.
 
 The primary goal of these storages is to support implementation of caching.
 """
+
 from typing import TYPE_CHECKING, Any
 
 from langchain_core.stores import (

langchain/storage/_lc_store.py

@@ -1,4 +1,5 @@
 """Create a key-value store for any langchain serializable object."""
+
 from typing import Callable, Optional
 
 from langchain_core.documents import Document

langchain/storage/in_memory.py

@@ -3,6 +3,7 @@
 This is a simple implementation of the BaseStore using a dictionary that is useful
 primarily for unit testing purposes.
 """
+
 from langchain_core.stores import InMemoryBaseStore, InMemoryByteStore, InMemoryStore
 
 __all__ = [

langchain/text_splitter.py

@@ -1,4 +1,5 @@
 """Kept for backwards compatibility."""
+
 from langchain_text_splitters import (
     Language,
     RecursiveCharacterTextSplitter,

langchain/tools/__init__.py

@@ -16,6 +16,7 @@ tool for the job.
 
     CallbackManagerForToolRun, AsyncCallbackManagerForToolRun
 """
+
 import warnings
 from typing import Any
 

langchain/tools/amadeus/__init__.py

@@ -1,4 +1,5 @@
 """Amadeus tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/azure_cognitive_services/__init__.py

@@ -1,4 +1,5 @@
 """Azure Cognitive Services Tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/bing_search/__init__.py

@@ -1,4 +1,5 @@
 """Bing Search API toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/dataforseo_api_search/__init__.py

@@ -1,4 +1,5 @@
 """DataForSeo API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/ddg_search/__init__.py

@@ -1,4 +1,5 @@
 """DuckDuckGo Search API toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/edenai/__init__.py

@@ -1,4 +1,5 @@
 """Edenai Tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/eleven_labs/__init__.py

@@ -1,4 +1,5 @@
 """Eleven Labs Services Tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/file_management/__init__.py

@@ -1,4 +1,5 @@
 """File Management Tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/github/__init__.py

@@ -1 +1 @@
-""" GitHub Tool """
+"""GitHub Tool"""

langchain/tools/gitlab/__init__.py

@@ -1 +1 @@
-""" GitLab Tool """
+"""GitLab Tool"""

langchain/tools/gmail/__init__.py

@@ -1,4 +1,5 @@
 """Gmail tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/golden_query/__init__.py

@@ -1,4 +1,5 @@
 """Golden API toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_cloud/__init__.py

@@ -1,4 +1,5 @@
 """Google Cloud Tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_finance/__init__.py

@@ -1,4 +1,5 @@
 """Google Finance API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_jobs/__init__.py

@@ -1,4 +1,5 @@
 """Google Jobs API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_lens/__init__.py

@@ -1,4 +1,5 @@
 """Google Lens API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_places/__init__.py

@@ -1,4 +1,5 @@
 """Google Places API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_scholar/__init__.py

@@ -1,4 +1,5 @@
 """Google Scholar API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_search/__init__.py

@@ -1,4 +1,5 @@
 """Google Search API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/google_trends/__init__.py

@@ -1,4 +1,5 @@
 """Google Trends API Toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/human/__init__.py

@@ -1,4 +1,5 @@
 """Tool for asking for human input."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/memorize/__init__.py

@@ -1,4 +1,5 @@
 """Unsupervised learning based memorization."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/metaphor_search/__init__.py

@@ -1,4 +1,5 @@
 """Metaphor Search API toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/multion/__init__.py

@@ -1,4 +1,5 @@
 """MutliOn Client API tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/office365/__init__.py

@@ -1,4 +1,5 @@
 """O365 tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/openapi/utils/openapi_utils.py

@@ -1,4 +1,5 @@
 """Utility functions for parsing an OpenAPI spec. Kept for backwards compat."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/openweathermap/__init__.py

@@ -1,4 +1,5 @@
 """OpenWeatherMap API toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/playwright/__init__.py

@@ -1,4 +1,5 @@
 """Browser tools and toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/shell/__init__.py

@@ -1,4 +1,5 @@
 """Shell tool."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/slack/__init__.py

@@ -1,4 +1,5 @@
 """Slack tools."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/sql_database/prompt.py

@@ -1,4 +1,5 @@
 """For backwards compatibility."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/steamship_image_generation/__init__.py

@@ -1,4 +1,5 @@
 """Tool to generate an image."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/tavily_search/__init__.py

@@ -1,4 +1,5 @@
 """Tavily Search API toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/wolfram_alpha/__init__.py

@@ -1,4 +1,5 @@
 """Wolfram Alpha API toolkit."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/tools/zapier/__init__.py

@@ -1,4 +1,5 @@
 """Zapier Tool."""
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/utilities/__init__.py

@@ -3,6 +3,7 @@
 Other LangChain classes use **Utilities** to interact with third-part systems
 and packages.
 """
+
 from typing import TYPE_CHECKING, Any
 
 from langchain._api import create_importer

langchain/utilities/python.py

@@ -1,4 +1,5 @@
 """For backwards compatibility."""
+
 from typing import Any
 
 from langchain._api import create_importer

langchain/vectorstores/__init__.py

@@ -18,6 +18,7 @@ and retrieve the data that are 'most similar' to the embedded query.
 
     Embeddings, Document
 """  # noqa: E501
+
 from typing import TYPE_CHECKING, Any
 
 from langchain_core.vectorstores import VectorStore

{langchain-0.2.5.dist-info → langchain-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain
-Version: 0.2.5
+Version: 0.2.7
 Summary: Building applications with LLMs through composability
 Home-page: https://github.com/langchain-ai/langchain
 License: MIT
@@ -15,14 +15,14 @@ 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.7,<0.3.0)
+Requires-Dist: langchain-core (>=0.2.12,<0.3.0)
 Requires-Dist: langchain-text-splitters (>=0.2.0,<0.3.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: requests (>=2,<3)
-Requires-Dist: tenacity (>=8.1.0,<9.0.0)
+Requires-Dist: tenacity (>=8.1.0,<9.0.0,!=8.4.0)
 Project-URL: Repository, https://github.com/langchain-ai/langchain
 Description-Content-Type: text/markdown
 
@@ -36,7 +36,6 @@ Description-Content-Type: text/markdown
 [![Downloads](https://static.pepy.tech/badge/langchain/month)](https://pepy.tech/project/langchain)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/langchainai.svg?style=social&label=Follow%20%40LangChainAI)](https://twitter.com/langchainai)
-[![](https://dcbadge.vercel.app/api/server/6adMQxSpJS?compact=true&style=flat)](https://discord.gg/6adMQxSpJS)
 [![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/langchain-ai/langchain)
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/langchain-ai/langchain)
 [![GitHub star chart](https://img.shields.io/github/stars/langchain-ai/langchain?style=social)](https://star-history.com/#langchain-ai/langchain)