langchain 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

langchain/hub.py

@@ -3,27 +3,37 @@
 from __future__ import annotations
 
 import json
-from typing import TYPE_CHECKING, Any, Optional
+from typing import Any, Optional, Sequence
 
 from langchain_core.load.dump import dumps
 from langchain_core.load.load import loads
 from langchain_core.prompts import BasePromptTemplate
 
-if TYPE_CHECKING:
-    from langchainhub import Client
 
-
-def _get_client(api_url: Optional[str] = None, api_key: Optional[str] = None) -> Client:
+def _get_client(
+    api_key: Optional[str] = None,
+    api_url: Optional[str] = None,
+) -> Any:
     try:
-        from langchainhub import Client
-    except ImportError as e:
-        raise ImportError(
-            "Could not import langchainhub, please install with `pip install "
-            "langchainhub`."
-        ) from e
+        from langsmith import Client as LangSmithClient
+
+        ls_client = LangSmithClient(api_url, api_key=api_key)
+        if hasattr(ls_client, "push_prompt") and hasattr(ls_client, "pull_prompt"):
+            return ls_client
+        else:
+            from langchainhub import Client as LangChainHubClient
 
-    # Client logic will also attempt to load URL/key from environment variables
-    return Client(api_url, api_key=api_key)
+            return LangChainHubClient(api_url, api_key=api_key)
+    except ImportError:
+        try:
+            from langchainhub import Client as LangChainHubClient
+
+            return LangChainHubClient(api_url, api_key=api_key)
+        except ImportError as e:
+            raise ImportError(
+                "Could not import langsmith or langchainhub (deprecated),"
+                "please install with `pip install langsmith`."
+            ) from e
 
 
 def push(
@@ -32,27 +42,43 @@ def push(
     *,
     api_url: Optional[str] = None,
     api_key: Optional[str] = None,
-    parent_commit_hash: Optional[str] = "latest",
-    new_repo_is_public: bool = True,
-    new_repo_description: str = "",
+    parent_commit_hash: Optional[str] = None,
+    new_repo_is_public: bool = False,
+    new_repo_description: Optional[str] = None,
+    readme: Optional[str] = None,
+    tags: Optional[Sequence[str]] = None,
 ) -> str:
     """
     Push an object to the hub and returns the URL it can be viewed at in a browser.
 
-    :param repo_full_name: The full name of the repo to push to in the format of
-        `owner/repo`.
+    :param repo_full_name: The full name of the prompt to push to in the format of
+        `owner/prompt_name` or `prompt_name`.
     :param object: The LangChain to serialize and push to the hub.
     :param api_url: The URL of the LangChain Hub API. Defaults to the hosted API service
         if you have an api key set, or a localhost instance if not.
     :param api_key: The API key to use to authenticate with the LangChain Hub API.
     :param parent_commit_hash: The commit hash of the parent commit to push to. Defaults
         to the latest commit automatically.
-    :param new_repo_is_public: Whether the repo should be public. Defaults to
-        True (Public by default).
-    :param new_repo_description: The description of the repo. Defaults to an empty
+    :param new_repo_is_public: Whether the prompt should be public. Defaults to
+        False (Private by default).
+    :param new_repo_description: The description of the prompt. Defaults to an empty
         string.
     """
-    client = _get_client(api_url=api_url, api_key=api_key)
+    client = _get_client(api_key=api_key, api_url=api_url)
+
+    # Then it's langsmith
+    if hasattr(client, "push_prompt"):
+        return client.push_prompt(
+            repo_full_name,
+            object=object,
+            parent_commit_hash=parent_commit_hash,
+            is_public=new_repo_is_public,
+            description=new_repo_description,
+            readme=readme,
+            tags=tags,
+        )
+
+    # Then it's langchainhub
     manifest_json = dumps(object)
     message = client.push(
         repo_full_name,
@@ -67,20 +93,28 @@ def push(
 def pull(
     owner_repo_commit: str,
     *,
+    include_model: Optional[bool] = None,
     api_url: Optional[str] = None,
     api_key: Optional[str] = None,
 ) -> Any:
     """
     Pull an object from the hub and returns it as a LangChain object.
 
-    :param owner_repo_commit: The full name of the repo to pull from in the format of
-        `owner/repo:commit_hash`.
+    :param owner_repo_commit: The full name of the prompt to pull from in the format of
+        `owner/prompt_name:commit_hash` or `owner/prompt_name`
+        or just `prompt_name` if it's your own prompt.
     :param api_url: The URL of the LangChain Hub API. Defaults to the hosted API service
         if you have an api key set, or a localhost instance if not.
     :param api_key: The API key to use to authenticate with the LangChain Hub API.
     """
-    client = _get_client(api_url=api_url, api_key=api_key)
+    client = _get_client(api_key=api_key, api_url=api_url)
+
+    # Then it's langsmith
+    if hasattr(client, "pull_prompt"):
+        response = client.pull_prompt(owner_repo_commit, include_model=include_model)
+        return response
 
+    # Then it's langchainhub
     if hasattr(client, "pull_repo"):
         # >= 0.1.15
         res_dict = client.pull_repo(owner_repo_commit)
@@ -93,6 +127,6 @@ def pull(
             obj.metadata["lc_hub_commit_hash"] = res_dict["commit_hash"]
         return obj
 
-    # Then it's < 0.1.15
+    # Then it's < 0.1.15 langchainhub
     resp: str = client.pull(owner_repo_commit)
     return loads(resp)

langchain/indexes/vectorstore.py

@@ -4,7 +4,7 @@ from langchain_core.document_loaders import BaseLoader
 from langchain_core.documents import Document
 from langchain_core.embeddings import Embeddings
 from langchain_core.language_models import BaseLanguageModel
-from langchain_core.pydantic_v1 import BaseModel, Extra, Field
+from langchain_core.pydantic_v1 import BaseModel, Field
 from langchain_core.vectorstores import VectorStore
 from langchain_text_splitters import RecursiveCharacterTextSplitter, TextSplitter
 
@@ -22,10 +22,8 @@ class VectorStoreIndexWrapper(BaseModel):
     vectorstore: VectorStore
 
     class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
         arbitrary_types_allowed = True
+        extra = "forbid"
 
     def query(
         self,
@@ -145,10 +143,8 @@ class VectorstoreIndexCreator(BaseModel):
     vectorstore_kwargs: dict = Field(default_factory=dict)
 
     class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
         arbitrary_types_allowed = True
+        extra = "forbid"
 
     def from_loaders(self, loaders: List[BaseLoader]) -> VectorStoreIndexWrapper:
         """Create a vectorstore index from loaders."""

langchain/memory/entity.py

@@ -246,8 +246,6 @@ class SQLiteEntityStore(BaseEntityStore):
     conn: Any = None
 
     class Config:
-        """Configuration for this pydantic object."""
-
         arbitrary_types_allowed = True
 
     def __init__(

langchain/memory/summary.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Any, Dict, List, Type
 
+from langchain_core._api import deprecated
 from langchain_core.chat_history import BaseChatMessageHistory
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.messages import BaseMessage, SystemMessage, get_buffer_string
@@ -14,6 +15,14 @@ from langchain.memory.chat_memory import BaseChatMemory
 from langchain.memory.prompt import SUMMARY_PROMPT
 
 
+@deprecated(
+    since="0.2.12",
+    removal="1.0",
+    message=(
+        "Refer here for how to incorporate summaries of conversation history: "
+        "https://langchain-ai.github.io/langgraph/how-tos/memory/add-summary-conversation-history/"  # noqa: E501
+    ),
+)
 class SummarizerMixin(BaseModel):
     """Mixin for summarizer."""
 

langchain/output_parsers/retry.py

@@ -214,7 +214,7 @@ class RetryWithErrorOutputParser(BaseOutputParser[T]):
         Returns:
             A RetryWithErrorOutputParser.
         """
-        chain = prompt | llm
+        chain = prompt | llm | StrOutputParser()
         return cls(parser=parser, retry_chain=chain, max_retries=max_retries)
 
     def parse_with_prompt(self, completion: str, prompt_value: PromptValue) -> T:

langchain/retrievers/contextual_compression.py

@@ -22,8 +22,6 @@ class ContextualCompressionRetriever(BaseRetriever):
     """Base Retriever to use for getting relevant documents."""
 
     class Config:
-        """Configuration for this pydantic object."""
-
         arbitrary_types_allowed = True
 
     def _get_relevant_documents(

langchain/retrievers/document_compressors/base.py

@@ -16,8 +16,6 @@ class DocumentCompressorPipeline(BaseDocumentCompressor):
     """List of document filters that are chained together and run in sequence."""
 
     class Config:
-        """Configuration for this pydantic object."""
-
         arbitrary_types_allowed = True
 
     def compress_documents(

langchain/retrievers/document_compressors/chain_filter.py

@@ -104,7 +104,7 @@ class LLMChainFilter(BaseDocumentCompressor):
         Args:
             llm: The language model to use for filtering.
             prompt: The prompt to use for the filter.
-            **kwargs: Additional arguments to pass to the constructor.
+            kwargs: Additional arguments to pass to the constructor.
 
         Returns:
             A LLMChainFilter that uses the given language model.

langchain/retrievers/document_compressors/cohere_rerank.py

@@ -6,14 +6,14 @@ from typing import Any, Dict, List, Optional, Sequence, Union
 from langchain_core._api.deprecation import deprecated
 from langchain_core.callbacks.manager import Callbacks
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Extra, root_validator
+from langchain_core.pydantic_v1 import root_validator
 from langchain_core.utils import get_from_dict_or_env
 
 from langchain.retrievers.document_compressors.base import BaseDocumentCompressor
 
 
 @deprecated(
-    since="0.0.30", removal="0.3.0", alternative_import="langchain_cohere.CohereRerank"
+    since="0.0.30", removal="1.0", alternative_import="langchain_cohere.CohereRerank"
 )
 class CohereRerank(BaseDocumentCompressor):
     """Document compressor that uses `Cohere Rerank API`."""
@@ -31,10 +31,8 @@ class CohereRerank(BaseDocumentCompressor):
     """Identifier for the application making the request."""
 
     class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
         arbitrary_types_allowed = True
+        extra = "forbid"
 
     @root_validator(pre=True)
     def validate_environment(cls, values: Dict) -> Dict:

langchain/retrievers/document_compressors/cross_encoder_rerank.py

@@ -5,7 +5,6 @@ from typing import Optional, Sequence
 
 from langchain_core.callbacks import Callbacks
 from langchain_core.documents import BaseDocumentCompressor, Document
-from langchain_core.pydantic_v1 import Extra
 
 from langchain.retrievers.document_compressors.cross_encoder import BaseCrossEncoder
 
@@ -20,10 +19,8 @@ class CrossEncoderReranker(BaseDocumentCompressor):
     """Number of documents to return."""
 
     class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
         arbitrary_types_allowed = True
+        extra = "forbid"
 
     def compress_documents(
         self,

langchain/retrievers/document_compressors/embeddings_filter.py

@@ -42,8 +42,6 @@ class EmbeddingsFilter(BaseDocumentCompressor):
     to None."""
 
     class Config:
-        """Configuration for this pydantic object."""
-
         arbitrary_types_allowed = True
 
     @pre_init

langchain/retrievers/document_compressors/listwise_rerank.py

@@ -105,7 +105,7 @@ class LLMListwiseRerank(BaseDocumentCompressor):
             llm: The language model to use for filtering. **Must implement
                 BaseLanguageModel.with_structured_output().**
             prompt: The prompt to use for the filter.
-            **kwargs: Additional arguments to pass to the constructor.
+            kwargs: Additional arguments to pass to the constructor.
 
         Returns:
             A LLMListwiseRerank document compressor that uses the given language model.

langchain/retrievers/multi_query.py

@@ -72,6 +72,8 @@ class MultiQueryRetriever(BaseRetriever):
         Args:
             retriever: retriever to query documents from
             llm: llm for query generation using DEFAULT_QUERY_PROMPT
+            prompt: The prompt which aims to generate several different versions
+                of the given user query
             include_original: Whether to include the original query in the list of
                 generated queries.
 
@@ -95,7 +97,7 @@ class MultiQueryRetriever(BaseRetriever):
         """Get relevant documents given a user query.
 
         Args:
-            question: user query
+            query: user query
 
         Returns:
             Unique union of relevant documents from all generated queries
@@ -158,7 +160,7 @@ class MultiQueryRetriever(BaseRetriever):
         """Get relevant documents given a user query.
 
         Args:
-            question: user query
+            query: user query
 
         Returns:
             Unique union of relevant documents from all generated queries

langchain/retrievers/re_phraser.py

@@ -64,7 +64,7 @@ class RePhraseQueryRetriever(BaseRetriever):
         *,
         run_manager: CallbackManagerForRetrieverRun,
     ) -> List[Document]:
-        """Get relevated documents given a user question.
+        """Get relevant documents given a user question.
 
         Args:
             query: user question

langchain/retrievers/self_query/base.py

@@ -215,10 +215,8 @@ class SelfQueryRetriever(BaseRetriever):
     """Use original query instead of the revised new query from LLM"""
 
     class Config:
-        """Configuration for this pydantic object."""
-
-        arbitrary_types_allowed = True
         allow_population_by_field_name = True
+        arbitrary_types_allowed = True
 
     @root_validator(pre=True)
     def validate_translator(cls, values: Dict) -> Dict:

langchain/retrievers/time_weighted_retriever.py

@@ -47,8 +47,6 @@ class TimeWeightedVectorStoreRetriever(BaseRetriever):
     """
 
     class Config:
-        """Configuration for this pydantic object."""
-
         arbitrary_types_allowed = True
 
     def _document_get_date(self, field: str, document: Document) -> datetime.datetime:

langchain/tools/__init__.py

@@ -21,7 +21,16 @@ import warnings
 from typing import Any
 
 from langchain_core._api import LangChainDeprecationWarning
-from langchain_core.tools import BaseTool, StructuredTool, Tool, tool
+from langchain_core.tools import (
+    BaseTool as BaseTool,
+)
+from langchain_core.tools import (
+    StructuredTool as StructuredTool,
+)
+from langchain_core.tools import (
+    Tool as Tool,
+)
+from langchain_core.tools.convert import tool as tool
 
 from langchain._api.interactive_env import is_interactive_env
 
@@ -75,6 +84,10 @@ def __getattr__(name: str) -> Any:
 
 
 __all__ = [
+    "StructuredTool",
+    "BaseTool",
+    "tool",
+    "Tool",
     "AINAppOps",
     "AINOwnerOps",
     "AINRuleOps",
@@ -92,7 +105,6 @@ __all__ = [
     "BaseRequestsTool",
     "BaseSQLDatabaseTool",
     "BaseSparkSQLTool",
-    "BaseTool",
     "BearlyInterpreterTool",
     "BingSearchResults",
     "BingSearchRun",
@@ -181,8 +193,6 @@ __all__ = [
     "StdInInquireTool",
     "StackExchangeTool",
     "SteamshipImageGenerationTool",
-    "StructuredTool",
-    "Tool",
     "VectorStoreQATool",
     "VectorStoreQAWithSourcesTool",
     "WikipediaQueryRun",
@@ -193,5 +203,4 @@ __all__ = [
     "ZapierNLAListActions",
     "ZapierNLARunAction",
     "format_tool_to_openai_function",
-    "tool",
 ]

langchain/tools/render.py

@@ -7,7 +7,6 @@ This module contains various ways to render tools.
 
 # For backwards compatibility
 from langchain_core.tools import (
-    ToolsRenderer,
     render_text_description,
     render_text_description_and_args,
 )
@@ -17,7 +16,6 @@ from langchain_core.utils.function_calling import (
 )
 
 __all__ = [
-    "ToolsRenderer",
     "render_text_description",
     "render_text_description_and_args",
     "format_tool_to_openai_tool",

langchain/tools/retriever.py

@@ -1,14 +1,10 @@
 from langchain_core.tools import (
-    RetrieverInput,
-    ToolsRenderer,
     create_retriever_tool,
     render_text_description,
     render_text_description_and_args,
 )
 
 __all__ = [
-    "RetrieverInput",
-    "ToolsRenderer",
     "create_retriever_tool",
     "render_text_description",
     "render_text_description_and_args",

{langchain-0.2.12.dist-info → langchain-0.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain
-Version: 0.2.12
+Version: 0.2.14
 Summary: Building applications with LLMs through composability
 Home-page: https://github.com/langchain-ai/langchain
 License: MIT
@@ -15,7 +15,7 @@ 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.27,<0.3.0)
+Requires-Dist: langchain-core (>=0.2.32,<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"