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

langchain/chains/llm_math/base.py

@@ -7,6 +7,7 @@ import re
 import warnings
 from typing import Any, Dict, List, Optional
 
+from langchain_core._api import deprecated
 from langchain_core.callbacks import (
     AsyncCallbackManagerForChainRun,
     CallbackManagerForChainRun,
@@ -20,16 +21,132 @@ from langchain.chains.llm import LLMChain
 from langchain.chains.llm_math.prompt import PROMPT
 
 
+@deprecated(
+    since="0.2.13",
+    message=(
+        "This class is deprecated and will be removed in langchain 1.0. "
+        "See API reference for replacement: "
+        "https://api.python.langchain.com/en/latest/chains/langchain.chains.llm_math.base.LLMMathChain.html"  # noqa: E501
+    ),
+    removal="1.0",
+)
 class LLMMathChain(Chain):
     """Chain that interprets a prompt and executes python code to do math.
 
+    Note: this class is deprecated. See below for a replacement implementation
+        using LangGraph. The benefits of this implementation are:
+
+        - Uses LLM tool calling features;
+        - Support for both token-by-token and step-by-step streaming;
+        - Support for checkpointing and memory of chat history;
+        - Easier to modify or extend (e.g., with additional tools, structured responses, etc.)
+
+        Install LangGraph with:
+
+        .. code-block:: bash
+
+            pip install -U langgraph
+
+        .. code-block:: python
+
+            import math
+            from typing import Annotated, Sequence
+
+            from langchain_core.messages import BaseMessage
+            from langchain_core.runnables import RunnableConfig
+            from langchain_core.tools import tool
+            from langchain_openai import ChatOpenAI
+            from langgraph.graph import END, StateGraph
+            from langgraph.graph.message import add_messages
+            from langgraph.prebuilt.tool_node import ToolNode
+            import numexpr
+            from typing_extensions import TypedDict
+
+            @tool
+            def calculator(expression: str) -> str:
+                \"\"\"Calculate expression using Python's numexpr library.
+
+                Expression should be a single line mathematical expression
+                that solves the problem.
+
+                Examples:
+                    "37593 * 67" for "37593 times 67"
+                    "37593**(1/5)" for "37593^(1/5)"
+                \"\"\"
+                local_dict = {"pi": math.pi, "e": math.e}
+                return str(
+                    numexpr.evaluate(
+                        expression.strip(),
+                        global_dict={},  # restrict access to globals
+                        local_dict=local_dict,  # add common mathematical functions
+                    )
+                )
+
+            llm = ChatOpenAI(model="gpt-4o-mini", temperature=0)
+            tools = [calculator]
+            llm_with_tools = llm.bind_tools(tools, tool_choice="any")
+
+            class ChainState(TypedDict):
+                \"\"\"LangGraph state.\"\"\"
+
+                messages: Annotated[Sequence[BaseMessage], add_messages]
+
+            async def acall_chain(state: ChainState, config: RunnableConfig):
+                last_message = state["messages"][-1]
+                response = await llm_with_tools.ainvoke(state["messages"], config)
+                return {"messages": [response]}
+
+            async def acall_model(state: ChainState, config: RunnableConfig):
+                response = await llm.ainvoke(state["messages"], config)
+                return {"messages": [response]}
+
+            graph_builder = StateGraph(ChainState)
+            graph_builder.add_node("call_tool", acall_chain)
+            graph_builder.add_node("execute_tool", ToolNode(tools))
+            graph_builder.add_node("call_model", acall_model)
+            graph_builder.set_entry_point("call_tool")
+            graph_builder.add_edge("call_tool", "execute_tool")
+            graph_builder.add_edge("execute_tool", "call_model")
+            graph_builder.add_edge("call_model", END)
+            chain = graph_builder.compile()
+
+        .. code-block:: python
+
+            example_query = "What is 551368 divided by 82"
+
+            events = chain.astream(
+                {"messages": [("user", example_query)]},
+                stream_mode="values",
+            )
+            async for event in events:
+                event["messages"][-1].pretty_print()
+
+        .. code-block:: none
+
+            ================================ Human Message =================================
+
+            What is 551368 divided by 82
+            ================================== Ai Message ==================================
+            Tool Calls:
+            calculator (call_MEiGXuJjJ7wGU4aOT86QuGJS)
+            Call ID: call_MEiGXuJjJ7wGU4aOT86QuGJS
+            Args:
+                expression: 551368 / 82
+            ================================= Tool Message =================================
+            Name: calculator
+
+            6724.0
+            ================================== Ai Message ==================================
+
+            551368 divided by 82 equals 6724.
+
     Example:
         .. code-block:: python
 
             from langchain.chains import LLMMathChain
             from langchain_community.llms import OpenAI
             llm_math = LLMMathChain.from_llm(OpenAI())
-    """
+    """  # noqa: E501
 
     llm_chain: LLMChain
     llm: Optional[BaseLanguageModel] = None

langchain/chains/natbot/base.py

@@ -5,15 +5,27 @@ from __future__ import annotations
 import warnings
 from typing import Any, Dict, List, Optional
 
+from langchain_core._api import deprecated
 from langchain_core.callbacks import CallbackManagerForChainRun
 from langchain_core.language_models import BaseLanguageModel
+from langchain_core.output_parsers import StrOutputParser
 from langchain_core.pydantic_v1 import root_validator
+from langchain_core.runnables import Runnable
 
 from langchain.chains.base import Chain
-from langchain.chains.llm import LLMChain
 from langchain.chains.natbot.prompt import PROMPT
 
 
+@deprecated(
+    since="0.2.13",
+    message=(
+        "Importing NatBotChain from langchain is deprecated and will be removed in "
+        "langchain 1.0. Please import from langchain_community instead: "
+        "from langchain_community.chains.natbot import NatBotChain. "
+        "You may need to pip install -U langchain-community."
+    ),
+    removal="1.0",
+)
 class NatBotChain(Chain):
     """Implement an LLM driven browser.
 
@@ -37,7 +49,7 @@ class NatBotChain(Chain):
             natbot = NatBotChain.from_default("Buy me a new hat.")
     """
 
-    llm_chain: LLMChain
+    llm_chain: Runnable
     objective: str
     """Objective that NatBot is tasked with completing."""
     llm: Optional[BaseLanguageModel] = None
@@ -60,7 +72,7 @@ class NatBotChain(Chain):
                 "class method."
             )
             if "llm_chain" not in values and values["llm"] is not None:
-                values["llm_chain"] = LLMChain(llm=values["llm"], prompt=PROMPT)
+                values["llm_chain"] = PROMPT | values["llm"] | StrOutputParser()
         return values
 
     @classmethod
@@ -77,7 +89,7 @@ class NatBotChain(Chain):
         cls, llm: BaseLanguageModel, objective: str, **kwargs: Any
     ) -> NatBotChain:
         """Load from LLM."""
-        llm_chain = LLMChain(llm=llm, prompt=PROMPT)
+        llm_chain = PROMPT | llm | StrOutputParser()
         return cls(llm_chain=llm_chain, objective=objective, **kwargs)
 
     @property
@@ -104,12 +116,14 @@ class NatBotChain(Chain):
         _run_manager = run_manager or CallbackManagerForChainRun.get_noop_manager()
         url = inputs[self.input_url_key]
         browser_content = inputs[self.input_browser_content_key]
-        llm_cmd = self.llm_chain.predict(
-            objective=self.objective,
-            url=url[:100],
-            previous_command=self.previous_command,
-            browser_content=browser_content[:4500],
-            callbacks=_run_manager.get_child(),
+        llm_cmd = self.llm_chain.invoke(
+            {
+                "objective": self.objective,
+                "url": url[:100],
+                "previous_command": self.previous_command,
+                "browser_content": browser_content[:4500],
+            },
+            config={"callbacks": _run_manager.get_child()},
         )
         llm_cmd = llm_cmd.strip()
         self.previous_command = llm_cmd

langchain/chains/openai_functions/base.py

@@ -43,7 +43,7 @@ __all__ = [
 ]
 
 
-@deprecated(since="0.1.1", removal="0.3.0", alternative="create_openai_fn_runnable")
+@deprecated(since="0.1.1", removal="1.0", alternative="create_openai_fn_runnable")
 def create_openai_fn_chain(
     functions: Sequence[Union[Dict[str, Any], Type[BaseModel], Callable]],
     llm: BaseLanguageModel,
@@ -145,7 +145,7 @@ def create_openai_fn_chain(
 
 
 @deprecated(
-    since="0.1.1", removal="0.3.0", alternative="ChatOpenAI.with_structured_output"
+    since="0.1.1", removal="1.0", alternative="ChatOpenAI.with_structured_output"
 )
 def create_structured_output_chain(
     output_schema: Union[Dict[str, Any], Type[BaseModel]],

langchain/chains/openai_functions/extraction.py

@@ -58,7 +58,7 @@ Passage:
         "feedback here:"
         "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
-    removal="0.3.0",
+    removal="1.0",
     alternative=(
         """
             from langchain_core.pydantic_v1 import BaseModel, Field
@@ -128,7 +128,7 @@ def create_extraction_chain(
         "feedback here:"
         "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
-    removal="0.3.0",
+    removal="1.0",
     alternative=(
         """
             from langchain_core.pydantic_v1 import BaseModel, Field

langchain/chains/openai_tools/extraction.py

@@ -29,7 +29,7 @@ If a property is not present and is not required in the function parameters, do
         "feedback here:"
         "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
-    removal="0.3.0",
+    removal="1.0",
     alternative=(
         """
             from langchain_core.pydantic_v1 import BaseModel, Field

langchain/chains/query_constructor/parser.py

@@ -35,6 +35,7 @@ GRAMMAR = r"""
     ?value: SIGNED_INT -> int
         | SIGNED_FLOAT -> float
         | DATE -> date
+        | DATETIME -> datetime
         | list
         | string
         | ("false" | "False" | "FALSE") -> false
@@ -42,6 +43,7 @@ GRAMMAR = r"""
 
     args: expr ("," expr)*
     DATE.2: /["']?(\d{4}-[01]\d-[0-3]\d)["']?/
+    DATETIME.2: /["']?\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d[Zz]?["']?/
     string: /'[^']*'/ | ESCAPED_STRING
     list: "[" [args] "]"
 
@@ -61,6 +63,13 @@ class ISO8601Date(TypedDict):
     type: Literal["date"]
 
 
+class ISO8601DateTime(TypedDict):
+    """A datetime in ISO 8601 format (YYYY-MM-DDTHH:MM:SS)."""
+
+    datetime: str
+    type: Literal["datetime"]
+
+
 @v_args(inline=True)
 class QueryTransformer(Transformer):
     """Transform a query string into an intermediate representation."""
@@ -149,6 +158,20 @@ class QueryTransformer(Transformer):
             )
         return {"date": item, "type": "date"}
 
+    def datetime(self, item: Any) -> ISO8601DateTime:
+        item = str(item).strip("\"'")
+        try:
+            # Parse full ISO 8601 datetime format
+            datetime.datetime.strptime(item, "%Y-%m-%dT%H:%M:%S%z")
+        except ValueError:
+            try:
+                datetime.datetime.strptime(item, "%Y-%m-%dT%H:%M:%S")
+            except ValueError:
+                raise ValueError(
+                    "Datetime values are expected to be in ISO 8601 format."
+                )
+        return {"datetime": item, "type": "datetime"}
+
     def string(self, item: Any) -> str:
         # Remove escaped quotes
         return str(item).strip("\"'")

langchain/chains/structured_output/base.py

@@ -41,7 +41,7 @@ from langchain_core.utils.pydantic import is_basemodel_subclass
         "feedback here: "
         "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
-    removal="0.3.0",
+    removal="1.0",
     alternative=(
         """
             from langchain_core.pydantic_v1 import BaseModel, Field
@@ -159,7 +159,7 @@ def create_openai_fn_runnable(
         "feedback here: "
         "<https://github.com/langchain-ai/langchain/discussions/18154>"
     ),
-    removal="0.3.0",
+    removal="1.0",
     alternative=(
         """
             from langchain_core.pydantic_v1 import BaseModel, Field

langchain/retrievers/document_compressors/chain_extract.py

@@ -8,8 +8,9 @@ from typing import Any, Callable, Dict, Optional, Sequence, cast
 from langchain_core.callbacks.manager import Callbacks
 from langchain_core.documents import Document
 from langchain_core.language_models import BaseLanguageModel
-from langchain_core.output_parsers import BaseOutputParser
+from langchain_core.output_parsers import BaseOutputParser, StrOutputParser
 from langchain_core.prompts import PromptTemplate
+from langchain_core.runnables import Runnable
 
 from langchain.chains.llm import LLMChain
 from langchain.retrievers.document_compressors.base import BaseDocumentCompressor
@@ -49,12 +50,15 @@ class LLMChainExtractor(BaseDocumentCompressor):
     """Document compressor that uses an LLM chain to extract
     the relevant parts of documents."""
 
-    llm_chain: LLMChain
+    llm_chain: Runnable
     """LLM wrapper to use for compressing documents."""
 
     get_input: Callable[[str, Document], dict] = default_get_input
     """Callable for constructing the chain input from the query and a Document."""
 
+    class Config:
+        arbitrary_types_allowed = True
+
     def compress_documents(
         self,
         documents: Sequence[Document],
@@ -65,10 +69,13 @@ class LLMChainExtractor(BaseDocumentCompressor):
         compressed_docs = []
         for doc in documents:
             _input = self.get_input(query, doc)
-            output_dict = self.llm_chain.invoke(_input, config={"callbacks": callbacks})
-            output = output_dict[self.llm_chain.output_key]
-            if self.llm_chain.prompt.output_parser is not None:
-                output = self.llm_chain.prompt.output_parser.parse(output)
+            output_ = self.llm_chain.invoke(_input, config={"callbacks": callbacks})
+            if isinstance(self.llm_chain, LLMChain):
+                output = output_[self.llm_chain.output_key]
+                if self.llm_chain.prompt.output_parser is not None:
+                    output = self.llm_chain.prompt.output_parser.parse(output)
+            else:
+                output = output_
             if len(output) == 0:
                 continue
             compressed_docs.append(
@@ -85,9 +92,7 @@ class LLMChainExtractor(BaseDocumentCompressor):
         """Compress page content of raw documents asynchronously."""
         outputs = await asyncio.gather(
             *[
-                self.llm_chain.apredict_and_parse(
-                    **self.get_input(query, doc), callbacks=callbacks
-                )
+                self.llm_chain.ainvoke(self.get_input(query, doc), callbacks=callbacks)
                 for doc in documents
             ]
         )
@@ -111,5 +116,9 @@ class LLMChainExtractor(BaseDocumentCompressor):
         """Initialize from LLM."""
         _prompt = prompt if prompt is not None else _get_default_chain_prompt()
         _get_input = get_input if get_input is not None else default_get_input
-        llm_chain = LLMChain(llm=llm, prompt=_prompt, **(llm_chain_kwargs or {}))
+        if _prompt.output_parser is not None:
+            parser = _prompt.output_parser
+        else:
+            parser = StrOutputParser()
+        llm_chain = _prompt | llm | parser
         return cls(llm_chain=llm_chain, get_input=_get_input)  # type: ignore[arg-type]

langchain/retrievers/document_compressors/chain_filter.py

@@ -5,7 +5,9 @@ from typing import Any, Callable, Dict, Optional, Sequence
 from langchain_core.callbacks.manager import Callbacks
 from langchain_core.documents import Document
 from langchain_core.language_models import BaseLanguageModel
+from langchain_core.output_parsers import StrOutputParser
 from langchain_core.prompts import BasePromptTemplate, PromptTemplate
+from langchain_core.runnables import Runnable
 from langchain_core.runnables.config import RunnableConfig
 
 from langchain.chains import LLMChain
@@ -32,13 +34,16 @@ def default_get_input(query: str, doc: Document) -> Dict[str, Any]:
 class LLMChainFilter(BaseDocumentCompressor):
     """Filter that drops documents that aren't relevant to the query."""
 
-    llm_chain: LLMChain
+    llm_chain: Runnable
     """LLM wrapper to use for filtering documents. 
     The chain prompt is expected to have a BooleanOutputParser."""
 
     get_input: Callable[[str, Document], dict] = default_get_input
     """Callable for constructing the chain input from the query and a Document."""
 
+    class Config:
+        arbitrary_types_allowed = True
+
     def compress_documents(
         self,
         documents: Sequence[Document],
@@ -56,11 +61,15 @@ class LLMChainFilter(BaseDocumentCompressor):
             documents,
         )
 
-        for output_dict, doc in outputs:
+        for output_, doc in outputs:
             include_doc = None
-            output = output_dict[self.llm_chain.output_key]
-            if self.llm_chain.prompt.output_parser is not None:
-                include_doc = self.llm_chain.prompt.output_parser.parse(output)
+            if isinstance(self.llm_chain, LLMChain):
+                output = output_[self.llm_chain.output_key]
+                if self.llm_chain.prompt.output_parser is not None:
+                    include_doc = self.llm_chain.prompt.output_parser.parse(output)
+            else:
+                if isinstance(output_, bool):
+                    include_doc = output_
             if include_doc:
                 filtered_docs.append(doc)
 
@@ -82,11 +91,15 @@ class LLMChainFilter(BaseDocumentCompressor):
             ),
             documents,
         )
-        for output_dict, doc in outputs:
+        for output_, doc in outputs:
             include_doc = None
-            output = output_dict[self.llm_chain.output_key]
-            if self.llm_chain.prompt.output_parser is not None:
-                include_doc = self.llm_chain.prompt.output_parser.parse(output)
+            if isinstance(self.llm_chain, LLMChain):
+                output = output_[self.llm_chain.output_key]
+                if self.llm_chain.prompt.output_parser is not None:
+                    include_doc = self.llm_chain.prompt.output_parser.parse(output)
+            else:
+                if isinstance(output_, bool):
+                    include_doc = output_
             if include_doc:
                 filtered_docs.append(doc)
 
@@ -110,5 +123,9 @@ class LLMChainFilter(BaseDocumentCompressor):
             A LLMChainFilter that uses the given language model.
         """
         _prompt = prompt if prompt is not None else _get_default_chain_prompt()
-        llm_chain = LLMChain(llm=llm, prompt=_prompt)
+        if _prompt.output_parser is not None:
+            parser = _prompt.output_parser
+        else:
+            parser = StrOutputParser()
+        llm_chain = _prompt | llm | parser
         return cls(llm_chain=llm_chain, **kwargs)

langchain/retrievers/document_compressors/cohere_rerank.py

@@ -13,7 +13,7 @@ from langchain.retrievers.document_compressors.base import BaseDocumentCompresso
 
 
 @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`."""

langchain/retrievers/re_phraser.py

@@ -7,11 +7,11 @@ from langchain_core.callbacks import (
 )
 from langchain_core.documents import Document
 from langchain_core.language_models import BaseLLM
+from langchain_core.output_parsers import StrOutputParser
 from langchain_core.prompts import BasePromptTemplate
 from langchain_core.prompts.prompt import PromptTemplate
 from langchain_core.retrievers import BaseRetriever
-
-from langchain.chains.llm import LLMChain
+from langchain_core.runnables import Runnable
 
 logger = logging.getLogger(__name__)
 
@@ -30,7 +30,7 @@ class RePhraseQueryRetriever(BaseRetriever):
     Then, retrieve docs for the re-phrased query."""
 
     retriever: BaseRetriever
-    llm_chain: LLMChain
+    llm_chain: Runnable
 
     @classmethod
     def from_llm(
@@ -51,8 +51,7 @@ class RePhraseQueryRetriever(BaseRetriever):
         Returns:
             RePhraseQueryRetriever
         """
-
-        llm_chain = LLMChain(llm=llm, prompt=prompt)
+        llm_chain = prompt | llm | StrOutputParser()
         return cls(
             retriever=retriever,
             llm_chain=llm_chain,
@@ -72,8 +71,9 @@ class RePhraseQueryRetriever(BaseRetriever):
         Returns:
             Relevant documents for re-phrased question
         """
-        response = self.llm_chain(query, callbacks=run_manager.get_child())
-        re_phrased_question = response["text"]
+        re_phrased_question = self.llm_chain.invoke(
+            query, {"callbacks": run_manager.get_child()}
+        )
         logger.info(f"Re-phrased question: {re_phrased_question}")
         docs = self.retriever.invoke(
             re_phrased_question, config={"callbacks": run_manager.get_child()}

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.13.dist-info → langchain-0.2.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain
-Version: 0.2.13
+Version: 0.2.15
 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.30,<0.3.0)
+Requires-Dist: langchain-core (>=0.2.35,<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"