github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-08-30 17:29:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

core[patch]: make get_all_basemodel_annotations public (#27761)

Browse Source
This commit is contained in:
Bagatur 2024-10-30 14:43:29 -07:00 committed by GitHub
parent 94ea950c6c
commit 5d337326b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/core/langchain_core/tools/base.py
View File

@ -449,7 +449,7 @@ class ChildTool(BaseTool):
def tool_call_schema(self) -> type[BaseModel]:
full_schema = self.get_input_schema()
fields = []
for name, type_ in _get_all_basemodel_annotations(full_schema).items():
for name, type_ in get_all_basemodel_annotations(full_schema).items():
if not _is_injected_arg_type(type_):
fields.append(name)
return _create_subset_model(
@ -962,7 +962,7 @@ def _is_injected_arg_type(type_: type) -> bool:
)
def _get_all_basemodel_annotations(
def get_all_basemodel_annotations(
cls: Union[TypeBaseModel, Any], *, default_to_bound: bool = True
) -> dict[str, type]:
# cls has no subscript: cls = FooBar
@ -980,7 +980,7 @@ def _get_all_basemodel_annotations(
orig_bases: tuple = getattr(cls, "__orig_bases__", ())
# cls has subscript: cls = FooBar[int]
else:
annotations = _get_all_basemodel_annotations(
annotations = get_all_basemodel_annotations(
get_origin(cls), default_to_bound=False
)
orig_bases = (cls,)
@ -994,7 +994,7 @@ def _get_all_basemodel_annotations(
# if class = FooBar inherits from Baz, parent = Baz
if isinstance(parent, type) and is_pydantic_v1_subclass(parent):
annotations.update(
_get_all_basemodel_annotations(parent, default_to_bound=False)
get_all_basemodel_annotations(parent, default_to_bound=False)
)
continue

7
libs/core/tests/unit_tests/runnables/test_runnable.py
View File

@ -1891,6 +1891,13 @@ async def test_prompt_with_chat_model_async(
)
@pytest.mark.skipif(
condition=sys.version_info[1] == 13,
reason=(
"temporary, py3.13 exposes some invalid assumptions about order of batch async "
"executions."
),
)
@freeze_time("2023-01-01")
async def test_prompt_with_llm(
mocker: MockerFixture, snapshot: SnapshotAssertion

26
libs/core/tests/unit_tests/test_tools.py
View File

@ -47,9 +47,9 @@ from langchain_core.tools import (
from langchain_core.tools.base import (
InjectedToolArg,
SchemaAnnotationError,
_get_all_basemodel_annotations,
_is_message_content_block,
_is_message_content_type,
get_all_basemodel_annotations,
)
from langchain_core.utils.function_calling import convert_to_openai_function
from langchain_core.utils.pydantic import PYDANTIC_MAJOR_VERSION, _create_subset_model
@ -1904,19 +1904,19 @@ def test__get_all_basemodel_annotations_v2(use_v1_namespace: bool) -> None:
c: dict
expected = {"a": str, "b": Annotated[ModelA[dict[str, Any]], "foo"], "c": dict}
actual = _get_all_basemodel_annotations(ModelC)
actual = get_all_basemodel_annotations(ModelC)
assert actual == expected
expected = {"a": str, "b": Annotated[ModelA[dict[str, Any]], "foo"]}
actual = _get_all_basemodel_annotations(ModelB)
actual = get_all_basemodel_annotations(ModelB)
assert actual == expected
expected = {"a": Any}
actual = _get_all_basemodel_annotations(ModelA)
actual = get_all_basemodel_annotations(ModelA)
assert actual == expected
expected = {"a": int}
actual = _get_all_basemodel_annotations(ModelA[int])
actual = get_all_basemodel_annotations(ModelA[int])
assert actual == expected
D = TypeVar("D", bound=Union[str, int])
@ -1930,7 +1930,7 @@ def test__get_all_basemodel_annotations_v2(use_v1_namespace: bool) -> None:
"c": dict,
"d": Union[str, int, None],
}
actual = _get_all_basemodel_annotations(ModelD)
actual = get_all_basemodel_annotations(ModelD)
assert actual == expected
expected = {
@ -1939,7 +1939,7 @@ def test__get_all_basemodel_annotations_v2(use_v1_namespace: bool) -> None:
"c": dict,
"d": Union[int, None],
}
actual = _get_all_basemodel_annotations(ModelD[int])
actual = get_all_basemodel_annotations(ModelD[int])
assert actual == expected
@ -1961,19 +1961,19 @@ def test__get_all_basemodel_annotations_v1() -> None:
c: dict
expected = {"a": str, "b": Annotated[ModelA[dict[str, Any]], "foo"], "c": dict}
actual = _get_all_basemodel_annotations(ModelC)
actual = get_all_basemodel_annotations(ModelC)
assert actual == expected
expected = {"a": str, "b": Annotated[ModelA[dict[str, Any]], "foo"]}
actual = _get_all_basemodel_annotations(ModelB)
actual = get_all_basemodel_annotations(ModelB)
assert actual == expected
expected = {"a": Any}
actual = _get_all_basemodel_annotations(ModelA)
actual = get_all_basemodel_annotations(ModelA)
assert actual == expected
expected = {"a": int}
actual = _get_all_basemodel_annotations(ModelA[int])
actual = get_all_basemodel_annotations(ModelA[int])
assert actual == expected
D = TypeVar("D", bound=Union[str, int])
@ -1987,7 +1987,7 @@ def test__get_all_basemodel_annotations_v1() -> None:
"c": dict,
"d": Union[str, int, None],
}
actual = _get_all_basemodel_annotations(ModelD)
actual = get_all_basemodel_annotations(ModelD)
assert actual == expected
expected = {
@ -1996,7 +1996,7 @@ def test__get_all_basemodel_annotations_v1() -> None:
"c": dict,
"d": Union[int, None],
}
actual = _get_all_basemodel_annotations(ModelD[int])
actual = get_all_basemodel_annotations(ModelD[int])
assert actual == expected