langchain 0.3.26__py3-none-any.whl → 0.3.27__py3-none-any.whl

langchain/chains/moderation.py

@@ -45,7 +45,9 @@ class OpenAIModerationChain(Chain):
     def validate_environment(cls, values: dict) -> Any:
         """Validate that api key and python package exists in environment."""
         openai_api_key = get_from_dict_or_env(
-            values, "openai_api_key", "OPENAI_API_KEY"
+            values,
+            "openai_api_key",
+            "OPENAI_API_KEY",
         )
         openai_organization = get_from_dict_or_env(
             values,
@@ -70,11 +72,12 @@ class OpenAIModerationChain(Chain):
                 values["client"] = openai.OpenAI(api_key=openai_api_key)
                 values["async_client"] = openai.AsyncOpenAI(api_key=openai_api_key)
 
-        except ImportError:
-            raise ImportError(
+        except ImportError as e:
+            msg = (
                 "Could not import openai python package. "
                 "Please install it with `pip install openai`."
             )
+            raise ImportError(msg) from e
         return values
 
     @property
@@ -94,16 +97,12 @@ class OpenAIModerationChain(Chain):
         return [self.output_key]
 
     def _moderate(self, text: str, results: Any) -> str:
-        if self.openai_pre_1_0:
-            condition = results["flagged"]
-        else:
-            condition = results.flagged
+        condition = results["flagged"] if self.openai_pre_1_0 else results.flagged
         if condition:
             error_str = "Text was found that violates OpenAI's content policy."
             if self.error:
                 raise ValueError(error_str)
-            else:
-                return error_str
+            return error_str
         return text
 
     def _call(

langchain/chains/natbot/base.py

@@ -6,9 +6,7 @@ import warnings
 from typing import Any, Optional
 
 from langchain_core._api import deprecated
-from langchain_core.caches import BaseCache as BaseCache
 from langchain_core.callbacks import CallbackManagerForChainRun
-from langchain_core.callbacks import Callbacks as Callbacks
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.output_parsers import StrOutputParser
 from langchain_core.runnables import Runnable
@@ -73,7 +71,8 @@ class NatBotChain(Chain):
             warnings.warn(
                 "Directly instantiating an NatBotChain with an llm is deprecated. "
                 "Please instantiate with llm_chain argument or using the from_llm "
-                "class method."
+                "class method.",
+                stacklevel=5,
             )
             if "llm_chain" not in values and values["llm"] is not None:
                 values["llm_chain"] = PROMPT | values["llm"] | StrOutputParser()
@@ -82,15 +81,19 @@ class NatBotChain(Chain):
     @classmethod
     def from_default(cls, objective: str, **kwargs: Any) -> NatBotChain:
         """Load with default LLMChain."""
-        raise NotImplementedError(
+        msg = (
             "This method is no longer implemented. Please use from_llm."
             "llm = OpenAI(temperature=0.5, best_of=10, n=3, max_tokens=50)"
             "For example, NatBotChain.from_llm(llm, objective)"
         )
+        raise NotImplementedError(msg)
 
     @classmethod
     def from_llm(
-        cls, llm: BaseLanguageModel, objective: str, **kwargs: Any
+        cls,
+        llm: BaseLanguageModel,
+        objective: str,
+        **kwargs: Any,
     ) -> NatBotChain:
         """Load from LLM."""
         llm_chain = PROMPT | llm | StrOutputParser()
@@ -158,6 +161,3 @@ class NatBotChain(Chain):
     @property
     def _chain_type(self) -> str:
         return "nat_bot_chain"
-
-
-NatBotChain.model_rebuild()

langchain/chains/natbot/crawler.py

@@ -1,23 +1,17 @@
-# flake8: noqa
 import time
 from sys import platform
 from typing import (
     TYPE_CHECKING,
     Any,
-    Dict,
-    Iterable,
-    List,
     Optional,
-    Set,
-    Tuple,
     TypedDict,
     Union,
 )
 
 if TYPE_CHECKING:
-    from playwright.sync_api import Browser, CDPSession, Page, sync_playwright
+    from playwright.sync_api import Browser, CDPSession, Page
 
-black_listed_elements: Set[str] = {
+black_listed_elements: set[str] = {
     "html",
     "head",
     "title",
@@ -40,7 +34,7 @@ class ElementInViewPort(TypedDict):
     backend_node_id: int
     node_name: Optional[str]
     node_value: Optional[str]
-    node_meta: List[str]
+    node_meta: list[str]
     is_clickable: bool
     origin_x: int
     origin_y: int
@@ -69,17 +63,18 @@ class Crawler:
     def __init__(self) -> None:
         try:
             from playwright.sync_api import sync_playwright
-        except ImportError:
-            raise ImportError(
+        except ImportError as e:
+            msg = (
                 "Could not import playwright python package. "
                 "Please install it with `pip install playwright`."
             )
+            raise ImportError(msg) from e
         self.browser: Browser = (
             sync_playwright().start().chromium.launch(headless=False)
         )
         self.page: Page = self.browser.new_page()
         self.page.set_viewport_size({"width": 1280, "height": 1080})
-        self.page_element_buffer: Dict[int, ElementInViewPort]
+        self.page_element_buffer: dict[int, ElementInViewPort]
         self.client: CDPSession
 
     def go_to_page(self, url: str) -> None:
@@ -90,15 +85,15 @@ class Crawler:
     def scroll(self, direction: str) -> None:
         if direction == "up":
             self.page.evaluate(
-                "(document.scrollingElement || document.body).scrollTop = (document.scrollingElement || document.body).scrollTop - window.innerHeight;"
+                "(document.scrollingElement || document.body).scrollTop = (document.scrollingElement || document.body).scrollTop - window.innerHeight;"  # noqa: E501
             )
         elif direction == "down":
             self.page.evaluate(
-                "(document.scrollingElement || document.body).scrollTop = (document.scrollingElement || document.body).scrollTop + window.innerHeight;"
+                "(document.scrollingElement || document.body).scrollTop = (document.scrollingElement || document.body).scrollTop + window.innerHeight;"  # noqa: E501
             )
 
-    def click(self, id: Union[str, int]) -> None:
-        # Inject javascript into the page which removes the target= attribute from all links
+    def click(self, id_: Union[str, int]) -> None:
+        # Inject javascript into the page which removes the target= attribute from links
         js = """
 		links = document.getElementsByTagName("a");
 		for (var i = 0; i < links.length; i++) {
@@ -107,7 +102,7 @@ class Crawler:
 		"""
         self.page.evaluate(js)
 
-        element = self.page_element_buffer.get(int(id))
+        element = self.page_element_buffer.get(int(id_))
         if element:
             x: float = element["center_x"]
             y: float = element["center_y"]
@@ -116,14 +111,14 @@ class Crawler:
         else:
             print("Could not find element")  # noqa: T201
 
-    def type(self, id: Union[str, int], text: str) -> None:
-        self.click(id)
+    def type(self, id_: Union[str, int], text: str) -> None:
+        self.click(id_)
         self.page.keyboard.type(text)
 
     def enter(self) -> None:
         self.page.keyboard.press("Enter")
 
-    def crawl(self) -> List[str]:
+    def crawl(self) -> list[str]:
         page = self.page
         page_element_buffer = self.page_element_buffer
         start = time.time()
@@ -141,10 +136,10 @@ class Crawler:
         win_right_bound: float = win_left_bound + win_width
         win_lower_bound: float = win_upper_bound + win_height
 
-        # 		percentage_progress_start = (win_upper_bound / document_scroll_height) * 100
-        # 		percentage_progress_end = (
-        # 			(win_height + win_upper_bound) / document_scroll_height
-        # 		) * 100
+        # 	percentage_progress_start = (win_upper_bound / document_scroll_height) * 100
+        # 	percentage_progress_end = (
+        # 		(win_height + win_upper_bound) / document_scroll_height
+        # 	) * 100
         percentage_progress_start = 1
         percentage_progress_end = 2
 
@@ -152,9 +147,7 @@ class Crawler:
             {
                 "x": 0,
                 "y": 0,
-                "text": "[scrollbar {:0.2f}-{:0.2f}%]".format(
-                    round(percentage_progress_start, 2), round(percentage_progress_end)
-                ),
+                "text": f"[scrollbar {percentage_progress_start:0.2f}-{percentage_progress_end:0.2f}%]",  # noqa: E501
             }
         )
 
@@ -162,34 +155,35 @@ class Crawler:
             "DOMSnapshot.captureSnapshot",
             {"computedStyles": [], "includeDOMRects": True, "includePaintOrder": True},
         )
-        strings: Dict[int, str] = tree["strings"]
-        document: Dict[str, Any] = tree["documents"][0]
-        nodes: Dict[str, Any] = document["nodes"]
-        backend_node_id: Dict[int, int] = nodes["backendNodeId"]
-        attributes: Dict[int, Dict[int, Any]] = nodes["attributes"]
-        node_value: Dict[int, int] = nodes["nodeValue"]
-        parent: Dict[int, int] = nodes["parentIndex"]
-        node_names: Dict[int, int] = nodes["nodeName"]
-        is_clickable: Set[int] = set(nodes["isClickable"]["index"])
-
-        input_value: Dict[str, Any] = nodes["inputValue"]
-        input_value_index: List[int] = input_value["index"]
-        input_value_values: List[int] = input_value["value"]
-
-        layout: Dict[str, Any] = document["layout"]
-        layout_node_index: List[int] = layout["nodeIndex"]
-        bounds: Dict[int, List[float]] = layout["bounds"]
+        strings: dict[int, str] = tree["strings"]
+        document: dict[str, Any] = tree["documents"][0]
+        nodes: dict[str, Any] = document["nodes"]
+        backend_node_id: dict[int, int] = nodes["backendNodeId"]
+        attributes: dict[int, dict[int, Any]] = nodes["attributes"]
+        node_value: dict[int, int] = nodes["nodeValue"]
+        parent: dict[int, int] = nodes["parentIndex"]
+        node_names: dict[int, int] = nodes["nodeName"]
+        is_clickable: set[int] = set(nodes["isClickable"]["index"])
+
+        input_value: dict[str, Any] = nodes["inputValue"]
+        input_value_index: list[int] = input_value["index"]
+        input_value_values: list[int] = input_value["value"]
+
+        layout: dict[str, Any] = document["layout"]
+        layout_node_index: list[int] = layout["nodeIndex"]
+        bounds: dict[int, list[float]] = layout["bounds"]
 
         cursor: int = 0
 
-        child_nodes: Dict[str, List[Dict[str, Any]]] = {}
-        elements_in_view_port: List[ElementInViewPort] = []
+        child_nodes: dict[str, list[dict[str, Any]]] = {}
+        elements_in_view_port: list[ElementInViewPort] = []
 
-        anchor_ancestry: Dict[str, Tuple[bool, Optional[int]]] = {"-1": (False, None)}
-        button_ancestry: Dict[str, Tuple[bool, Optional[int]]] = {"-1": (False, None)}
+        anchor_ancestry: dict[str, tuple[bool, Optional[int]]] = {"-1": (False, None)}
+        button_ancestry: dict[str, tuple[bool, Optional[int]]] = {"-1": (False, None)}
 
         def convert_name(
-            node_name: Optional[str], has_click_handler: Optional[bool]
+            node_name: Optional[str],
+            has_click_handler: Optional[bool],  # noqa: FBT001
         ) -> str:
             if node_name == "a":
                 return "link"
@@ -201,12 +195,11 @@ class Crawler:
                 node_name == "button" or has_click_handler
             ):  # found pages that needed this quirk
                 return "button"
-            else:
-                return "text"
+            return "text"
 
         def find_attributes(
-            attributes: Dict[int, Any], keys: List[str]
-        ) -> Dict[str, str]:
+            attributes: dict[int, Any], keys: list[str]
+        ) -> dict[str, str]:
             values = {}
 
             for [key_index, value_index] in zip(*(iter(attributes),) * 2):
@@ -225,14 +218,14 @@ class Crawler:
             return values
 
         def add_to_hash_tree(
-            hash_tree: Dict[str, Tuple[bool, Optional[int]]],
+            hash_tree: dict[str, tuple[bool, Optional[int]]],
             tag: str,
             node_id: int,
             node_name: Optional[str],
             parent_id: int,
-        ) -> Tuple[bool, Optional[int]]:
+        ) -> tuple[bool, Optional[int]]:
             parent_id_str = str(parent_id)
-            if not parent_id_str in hash_tree:
+            if parent_id_str not in hash_tree:
                 parent_name = strings[node_names[parent_id]].lower()
                 grand_parent_id = parent[parent_id]
 
@@ -242,9 +235,10 @@ class Crawler:
 
             is_parent_desc_anchor, anchor_id = hash_tree[parent_id_str]
 
-            # even if the anchor is nested in another anchor, we set the "root" for all descendants to be ::Self
+            # even if the anchor is nested in another anchor, we set the "root" for all
+            # descendants to be ::Self
             if node_name == tag:
-                value: Tuple[bool, Optional[int]] = (True, node_id)
+                value: tuple[bool, Optional[int]] = (True, node_id)
             elif (
                 is_parent_desc_anchor
             ):  # reuse the parent's anchor_id (which could be much higher in the tree)
@@ -253,7 +247,9 @@ class Crawler:
                 value = (
                     False,
                     None,
-                )  # not a descendant of an anchor, most likely it will become text, an interactive element or discarded
+                )
+                # not a descendant of an anchor, most likely it will become text, an
+                # interactive element or discarded
 
             hash_tree[str(node_id)] = value
 
@@ -272,10 +268,10 @@ class Crawler:
             )
 
             try:
-                cursor = layout_node_index.index(
-                    index
-                )  # todo replace this with proper cursoring, ignoring the fact this is O(n^2) for the moment
-            except:
+                cursor = layout_node_index.index(index)
+                # TODO replace this with proper cursoring, ignoring the fact this is
+                # O(n^2) for the moment
+            except ValueError:
                 continue
 
             if node_name in black_listed_elements:
@@ -302,9 +298,10 @@ class Crawler:
             if not partially_is_in_viewport:
                 continue
 
-            meta_data: List[str] = []
+            meta_data: list[str] = []
 
-            # inefficient to grab the same set of keys for kinds of objects, but it's fine for now
+            # inefficient to grab the same set of keys for kinds of objects, but it's
+            # fine for now
             element_attributes = find_attributes(
                 attributes[index], ["type", "placeholder", "aria-label", "title", "alt"]
             )
@@ -325,7 +322,7 @@ class Crawler:
 
             if node_name == "#text" and ancestor_exception and ancestor_node:
                 text = strings[node_value[index]]
-                if text == "|" or text == "•":
+                if text in {"|", "•"}:
                     continue
                 ancestor_node.append({"type": "type", "value": text})
             else:
@@ -355,7 +352,9 @@ class Crawler:
                 element_node_value = strings[node_value[index]]
                 if (
                     element_node_value == "|"
-                ):  # commonly used as a separator, does not add much context - lets save ourselves some token space
+                    # commonly used as a separator, does not add much context - lets
+                    # save ourselves some token space
+                ):
                     continue
             elif (
                 node_name == "input"
@@ -368,7 +367,7 @@ class Crawler:
                     element_node_value = strings[text_index]
 
             # remove redundant elements
-            if ancestor_exception and (node_name != "a" and node_name != "button"):
+            if ancestor_exception and (node_name not in {"a", "button"}):
                 continue
 
             elements_in_view_port.append(
@@ -386,7 +385,8 @@ class Crawler:
                 }
             )
 
-        # lets filter further to remove anything that does not hold any text nor has click handlers + merge text from leaf#text nodes with the parent
+        # lets filter further to remove anything that does not hold any text nor has
+        # click handlers + merge text from leaf#text nodes with the parent
         elements_of_interest = []
         id_counter = 0
 
@@ -395,7 +395,7 @@ class Crawler:
             node_name = element.get("node_name")
             element_node_value = element.get("node_value")
             node_is_clickable = element.get("is_clickable")
-            node_meta_data: Optional[List[str]] = element.get("node_meta")
+            node_meta_data: Optional[list[str]] = element.get("node_meta")
 
             inner_text = f"{element_node_value} " if element_node_value else ""
             meta = ""
@@ -423,10 +423,7 @@ class Crawler:
             # not very elegant, more like a placeholder
             if (
                 (converted_node_name != "button" or meta == "")
-                and converted_node_name != "link"
-                and converted_node_name != "input"
-                and converted_node_name != "img"
-                and converted_node_name != "textarea"
+                and converted_node_name not in {"link", "input", "img", "textarea"}
             ) and inner_text.strip() == "":
                 continue
 
@@ -434,7 +431,7 @@ class Crawler:
 
             if inner_text != "":
                 elements_of_interest.append(
-                    f"""<{converted_node_name} id={id_counter}{meta}>{inner_text}</{converted_node_name}>"""
+                    f"""<{converted_node_name} id={id_counter}{meta}>{inner_text}</{converted_node_name}>"""  # noqa: E501
                 )
             else:
                 elements_of_interest.append(
@@ -442,5 +439,5 @@ class Crawler:
                 )
             id_counter += 1
 
-        print("Parsing time: {:0.2f} seconds".format(time.time() - start))  # noqa: T201
+        print(f"Parsing time: {time.time() - start:0.2f} seconds")  # noqa: T201
         return elements_of_interest

langchain/chains/natbot/prompt.py

@@ -1,4 +1,3 @@
-# flake8: noqa
 from langchain_core.prompts.prompt import PromptTemplate
 
 _PROMPT_TEMPLATE = """
@@ -115,7 +114,7 @@ CURRENT BROWSER CONTENT:
 <text id=10>7:00 PM</text>
 <text id=11>2 people</text>
 <input id=12 alt="Location, Restaurant, or Cuisine"></input>
-<button id=13>Let’s go</button>
+<button id=13>Let's go</button>
 <text id=14>It looks like you're in Peninsula. Not correct?</text>
 <button id=15>Get current location</button>
 <button id=16>Next</button>
@@ -137,7 +136,7 @@ OBJECTIVE: {objective}
 CURRENT URL: {url}
 PREVIOUS COMMAND: {previous_command}
 YOUR COMMAND:
-"""
+"""  # noqa: E501
 PROMPT = PromptTemplate(
     input_variables=["browser_content", "url", "previous_command", "objective"],
     template=_PROMPT_TEMPLATE,

langchain/chains/openai_functions/__init__.py

@@ -28,17 +28,17 @@ from langchain.chains.structured_output.base import (
 
 __all__ = [
     "convert_to_openai_function",
-    "create_tagging_chain",
-    "create_tagging_chain_pydantic",
-    "create_extraction_chain_pydantic",
-    "create_extraction_chain",
     "create_citation_fuzzy_match_chain",
     "create_citation_fuzzy_match_runnable",
-    "create_qa_with_structure_chain",
+    "create_extraction_chain",
+    "create_extraction_chain_pydantic",
+    "create_openai_fn_chain",
+    "create_openai_fn_runnable",  # backwards compatibility
     "create_qa_with_sources_chain",
+    "create_qa_with_structure_chain",
     "create_structured_output_chain",
-    "create_openai_fn_chain",
     "create_structured_output_runnable",  # backwards compatibility
-    "create_openai_fn_runnable",  # backwards compatibility
+    "create_tagging_chain",
+    "create_tagging_chain_pydantic",
     "get_openai_output_parser",  # backwards compatibility
 ]

langchain/chains/openai_functions/base.py

@@ -31,13 +31,13 @@ from langchain.chains.structured_output.base import (
 )
 
 __all__ = [
-    "get_openai_output_parser",
-    "create_openai_fn_runnable",
-    "create_structured_output_runnable",  # deprecated
-    "create_openai_fn_chain",  # deprecated
-    "create_structured_output_chain",  # deprecated
     "PYTHON_TO_JSON_TYPES",  # backwards compatibility
     "convert_to_openai_function",  # backwards compatibility
+    "create_openai_fn_chain",  # deprecated
+    "create_openai_fn_runnable",
+    "create_structured_output_chain",  # deprecated
+    "create_structured_output_runnable",  # deprecated
+    "get_openai_output_parser",
 ]
 
 
@@ -123,7 +123,8 @@ def create_openai_fn_chain(
                 # -> RecordDog(name="Harry", color="brown", fav_food="chicken")
     """  # noqa: E501
     if not functions:
-        raise ValueError("Need to pass in at least one function. Received zero.")
+        msg = "Need to pass in at least one function. Received zero."
+        raise ValueError(msg)
     openai_functions = [convert_to_openai_function(f) for f in functions]
     output_parser = output_parser or get_openai_output_parser(functions)
     llm_kwargs: dict[str, Any] = {
@@ -131,7 +132,7 @@ def create_openai_fn_chain(
     }
     if len(openai_functions) == 1 and enforce_single_function_usage:
         llm_kwargs["function_call"] = {"name": openai_functions[0]["name"]}
-    llm_chain = LLMChain(
+    return LLMChain(
         llm=llm,
         prompt=prompt,
         output_parser=output_parser,
@@ -139,11 +140,12 @@ def create_openai_fn_chain(
         output_key=output_key,
         **kwargs,
     )
-    return llm_chain
 
 
 @deprecated(
-    since="0.1.1", removal="1.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]],
@@ -220,7 +222,8 @@ def create_structured_output_chain(
 
         function = _OutputFormatter
         output_parser = output_parser or PydanticAttrOutputFunctionsParser(
-            pydantic_schema=_OutputFormatter, attr_name="output"
+            pydantic_schema=_OutputFormatter,
+            attr_name="output",
         )
     return create_openai_fn_chain(
         [function],

langchain/chains/openai_functions/citation_fuzzy_match.py

@@ -88,23 +88,22 @@ def create_citation_fuzzy_match_runnable(llm: BaseChatModel) -> Runnable:
         Runnable that can be used to answer questions with citations.
     """
     if llm.bind_tools is BaseChatModel.bind_tools:
-        raise ValueError(
-            "Language model must implement bind_tools to use this function."
-        )
+        msg = "Language model must implement bind_tools to use this function."
+        raise ValueError(msg)
     prompt = ChatPromptTemplate(
         [
             SystemMessage(
                 "You are a world class algorithm to answer "
-                "questions with correct and exact citations."
+                "questions with correct and exact citations.",
             ),
             HumanMessagePromptTemplate.from_template(
                 "Answer question using the following context."
                 "\n\n{context}"
                 "\n\nQuestion: {question}"
                 "\n\nTips: Make sure to cite your sources, "
-                "and use the exact words from the context."
+                "and use the exact words from the context.",
             ),
-        ]
+        ],
     )
     return prompt | llm.with_structured_output(QuestionAnswer)
 
@@ -124,7 +123,10 @@ def create_citation_fuzzy_match_chain(llm: BaseLanguageModel) -> LLMChain:
         Chain (LLMChain) that can be used to answer questions with citations.
     """
     output_parser = PydanticOutputFunctionsParser(pydantic_schema=QuestionAnswer)
-    schema = QuestionAnswer.schema()
+    if hasattr(QuestionAnswer, "model_json_schema"):
+        schema = QuestionAnswer.model_json_schema()
+    else:
+        schema = QuestionAnswer.schema()
     function = {
         "name": schema["title"],
         "description": schema["description"],
@@ -136,7 +138,7 @@ def create_citation_fuzzy_match_chain(llm: BaseLanguageModel) -> LLMChain:
             content=(
                 "You are a world class algorithm to answer "
                 "questions with correct and exact citations."
-            )
+            ),
         ),
         HumanMessage(content="Answer question using the following context"),
         HumanMessagePromptTemplate.from_template("{context}"),
@@ -145,15 +147,14 @@ def create_citation_fuzzy_match_chain(llm: BaseLanguageModel) -> LLMChain:
             content=(
                 "Tips: Make sure to cite your sources, "
                 "and use the exact words from the context."
-            )
+            ),
         ),
     ]
     prompt = ChatPromptTemplate(messages=messages)  # type: ignore[arg-type]
 
-    chain = LLMChain(
+    return LLMChain(
         llm=llm,
         prompt=prompt,
         llm_kwargs=llm_kwargs,
         output_parser=output_parser,
     )
-    return chain