Merge branch 'master' into master

ZenGuard-AI · Jun 25, 2024 · 4523b29 · 4523b29
2 parents 80eed0e + 730c551
commit 4523b29
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/libs/core/langchain_core/output_parsers/__init__.py b/libs/core/langchain_core/output_parsers/__init__.py
@@ -24,6 +24,11 @@
     MarkdownListOutputParser,
     NumberedListOutputParser,
 )
+from langchain_core.output_parsers.openai_tools import (
+    JsonOutputKeyToolsParser,
+    JsonOutputToolsParser,
+    PydanticToolsParser,
+)
 from langchain_core.output_parsers.pydantic import PydanticOutputParser
 from langchain_core.output_parsers.string import StrOutputParser
 from langchain_core.output_parsers.transform import (
@@ -47,4 +52,7 @@
     "XMLOutputParser",
     "JsonOutputParser",
     "PydanticOutputParser",
+    "JsonOutputToolsParser",
+    "JsonOutputKeyToolsParser",
+    "PydanticToolsParser",
 ]
diff --git a/libs/core/langchain_core/output_parsers/openai_tools.py b/libs/core/langchain_core/output_parsers/openai_tools.py
@@ -5,7 +5,7 @@
 
 from langchain_core.exceptions import OutputParserException
 from langchain_core.messages import AIMessage, InvalidToolCall
-from langchain_core.output_parsers import BaseCumulativeTransformOutputParser
+from langchain_core.output_parsers.transform import BaseCumulativeTransformOutputParser
 from langchain_core.outputs import ChatGeneration, Generation
 from langchain_core.pydantic_v1 import BaseModel, ValidationError
 from langchain_core.utils.json import parse_partial_json

diff --git a/libs/core/tests/unit_tests/documents/test_str.py b/libs/core/tests/unit_tests/documents/test_str.py
@@ -0,0 +1,20 @@
+from langchain_core.documents import Document
+
+
+def test_str() -> None:
+    assert str(Document(page_content="Hello, World!")) == "page_content='Hello, World!'"
+    assert (
+        str(Document(page_content="Hello, World!", metadata={"a": 3}))
+        == "page_content='Hello, World!' metadata={'a': 3}"
+    )
+
+
+def test_repr() -> None:
+    assert (
+        repr(Document(page_content="Hello, World!"))
+        == "Document(page_content='Hello, World!')"
+    )
+    assert (
+        repr(Document(page_content="Hello, World!", metadata={"a": 3}))
+        == "Document(page_content='Hello, World!', metadata={'a': 3})"
+    )
diff --git a/libs/core/tests/unit_tests/output_parsers/test_imports.py b/libs/core/tests/unit_tests/output_parsers/test_imports.py
@@ -15,6 +15,9 @@
     "XMLOutputParser",
     "JsonOutputParser",
     "PydanticOutputParser",
+    "JsonOutputToolsParser",
+    "JsonOutputKeyToolsParser",
+    "PydanticToolsParser",
 ]