From 60b1bd02d7b46b5224865bbd77ee21d98c8ca4b7 Mon Sep 17 00:00:00 2001 From: Leonid Ganeline Date: Wed, 17 Jan 2024 10:02:12 -0800 Subject: [PATCH] langchain[patch]: updated imports for `output_parsers` (#16059) Updated imports from `langchain` to `core` where it is possible --- libs/langchain/langchain/output_parsers/datetime.py | 3 +-- libs/langchain/langchain/output_parsers/openai_functions.py | 3 +-- libs/langchain/langchain/output_parsers/pandas_dataframe.py | 6 ++++-- libs/langchain/langchain/output_parsers/structured.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/langchain/langchain/output_parsers/datetime.py b/libs/langchain/langchain/output_parsers/datetime.py index 837f0b0b8be..100e324c8a8 100644 --- a/libs/langchain/langchain/output_parsers/datetime.py +++ b/libs/langchain/langchain/output_parsers/datetime.py @@ -4,8 +4,7 @@ from typing import List from langchain_core.exceptions import OutputParserException from langchain_core.output_parsers import BaseOutputParser - -from langchain.utils import comma_list +from langchain_core.utils import comma_list def _generate_random_datetime_strings( diff --git a/libs/langchain/langchain/output_parsers/openai_functions.py b/libs/langchain/langchain/output_parsers/openai_functions.py index 5f52d4e6b6f..8551706c4d3 100644 --- a/libs/langchain/langchain/output_parsers/openai_functions.py +++ b/libs/langchain/langchain/output_parsers/openai_functions.py @@ -8,11 +8,10 @@ from langchain_core.output_parsers import ( BaseCumulativeTransformOutputParser, BaseGenerationOutputParser, ) +from langchain_core.output_parsers.json import parse_partial_json from langchain_core.outputs import ChatGeneration, Generation from langchain_core.pydantic_v1 import BaseModel, root_validator -from langchain.output_parsers.json import parse_partial_json - class OutputFunctionsParser(BaseGenerationOutputParser[Any]): """Parse an output that is one of sets of values.""" diff --git a/libs/langchain/langchain/output_parsers/pandas_dataframe.py b/libs/langchain/langchain/output_parsers/pandas_dataframe.py index 85bde591026..4c0cb177d02 100644 --- a/libs/langchain/langchain/output_parsers/pandas_dataframe.py +++ b/libs/langchain/langchain/output_parsers/pandas_dataframe.py @@ -1,11 +1,13 @@ import re from typing import Any, Dict, List, Tuple, Union +from langchain_core.exceptions import OutputParserException +from langchain_core.output_parsers.base import BaseOutputParser +from langchain_core.pydantic_v1 import validator + from langchain.output_parsers.format_instructions import ( PANDAS_DATAFRAME_FORMAT_INSTRUCTIONS, ) -from langchain.pydantic_v1 import validator -from langchain.schema import BaseOutputParser, OutputParserException class PandasDataFrameOutputParser(BaseOutputParser): diff --git a/libs/langchain/langchain/output_parsers/structured.py b/libs/langchain/langchain/output_parsers/structured.py index 1d1b61128fc..1d99363bc17 100644 --- a/libs/langchain/langchain/output_parsers/structured.py +++ b/libs/langchain/langchain/output_parsers/structured.py @@ -3,13 +3,13 @@ from __future__ import annotations from typing import Any, List from langchain_core.output_parsers import BaseOutputParser +from langchain_core.output_parsers.json import parse_and_check_json_markdown from langchain_core.pydantic_v1 import BaseModel from langchain.output_parsers.format_instructions import ( STRUCTURED_FORMAT_INSTRUCTIONS, STRUCTURED_FORMAT_SIMPLE_INSTRUCTIONS, ) -from langchain.output_parsers.json import parse_and_check_json_markdown line_template = '\t"{name}": {type} // {description}'