From d350be959d22f05785bd1676652c156343f1b950 Mon Sep 17 00:00:00 2001 From: Leonid Ganeline Date: Wed, 17 Jan 2024 09:58:42 -0800 Subject: [PATCH] langchain[patch]: updated `chains` imports (#16064) Updated imports into `langchain` to `core` where it is possible --------- Co-authored-by: Bagatur --- libs/langchain/langchain/chains/api/base.py | 8 ++++---- .../langchain/chains/api/openapi/chain.py | 2 +- libs/langchain/langchain/chains/base.py | 16 ++++++++-------- .../langchain/chains/combine_documents/base.py | 8 ++++---- .../chains/combine_documents/map_reduce.py | 2 +- .../chains/combine_documents/map_rerank.py | 2 +- .../langchain/chains/combine_documents/reduce.py | 2 +- .../langchain/chains/combine_documents/refine.py | 2 +- .../langchain/chains/combine_documents/stuff.py | 2 +- .../langchain/chains/constitutional_ai/base.py | 2 +- .../chains/conversational_retrieval/base.py | 10 +++++----- .../chains/elasticsearch_database/base.py | 4 ++-- .../langchain/chains/ernie_functions/base.py | 13 ++++++++----- libs/langchain/langchain/chains/flare/base.py | 6 +++--- .../langchain/chains/graph_qa/arangodb.py | 4 ++-- .../langchain/chains/graph_qa/cypher.py | 2 +- .../langchain/chains/graph_qa/falkordb.py | 4 ++-- .../langchain/chains/graph_qa/hugegraph.py | 2 +- libs/langchain/langchain/chains/graph_qa/kuzu.py | 2 +- .../langchain/chains/graph_qa/nebulagraph.py | 2 +- .../langchain/chains/graph_qa/neptune_cypher.py | 4 ++-- .../langchain/chains/graph_qa/sparql.py | 2 +- libs/langchain/langchain/chains/hyde/base.py | 2 +- libs/langchain/langchain/chains/llm.py | 14 +++++++------- .../langchain/chains/llm_checker/base.py | 2 +- libs/langchain/langchain/chains/llm_math/base.py | 8 ++++---- libs/langchain/langchain/chains/llm_requests.py | 2 +- .../chains/llm_summarization_checker/base.py | 2 +- libs/langchain/langchain/chains/mapreduce.py | 2 +- libs/langchain/langchain/chains/moderation.py | 4 ++-- libs/langchain/langchain/chains/natbot/base.py | 2 +- .../langchain/chains/openai_functions/base.py | 2 +- .../langchain/chains/openai_functions/openapi.py | 2 +- .../langchain/chains/openai_tools/extraction.py | 2 +- .../langchain/chains/qa_generation/base.py | 2 +- .../langchain/chains/qa_with_sources/base.py | 8 ++++---- .../chains/qa_with_sources/retrieval.py | 8 ++++---- .../chains/qa_with_sources/vector_db.py | 8 ++++---- .../langchain/chains/query_constructor/base.py | 2 +- .../chains/question_answering/__init__.py | 3 +-- .../langchain/chains/retrieval_qa/base.py | 10 +++++----- libs/langchain/langchain/chains/router/base.py | 6 +++--- .../langchain/chains/router/embedding_router.py | 2 +- .../langchain/chains/router/llm_router.py | 8 ++++---- libs/langchain/langchain/chains/sequential.py | 8 ++++---- .../langchain/chains/sql_database/prompt.py | 2 +- .../langchain/chains/summarize/__init__.py | 2 +- libs/langchain/langchain/chains/transform.py | 6 +++--- 48 files changed, 111 insertions(+), 109 deletions(-) diff --git a/libs/langchain/langchain/chains/api/base.py b/libs/langchain/langchain/chains/api/base.py index 05b18330efc..212c04845c7 100644 --- a/libs/langchain/langchain/chains/api/base.py +++ b/libs/langchain/langchain/chains/api/base.py @@ -5,14 +5,14 @@ from typing import Any, Dict, List, Optional, Sequence, Tuple from urllib.parse import urlparse from langchain_community.utilities.requests import TextRequestsWrapper +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, +) from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field, root_validator -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, -) from langchain.chains.api.prompt import API_RESPONSE_PROMPT, API_URL_PROMPT from langchain.chains.base import Chain from langchain.chains.llm import LLMChain diff --git a/libs/langchain/langchain/chains/api/openapi/chain.py b/libs/langchain/langchain/chains/api/openapi/chain.py index ead27fbf37d..7fad47fedd8 100644 --- a/libs/langchain/langchain/chains/api/openapi/chain.py +++ b/libs/langchain/langchain/chains/api/openapi/chain.py @@ -6,11 +6,11 @@ from typing import Any, Dict, List, NamedTuple, Optional, cast from langchain_community.tools.openapi.utils.api_models import APIOperation from langchain_community.utilities.requests import Requests +from langchain_core.callbacks import CallbackManagerForChainRun, Callbacks from langchain_core.language_models import BaseLanguageModel from langchain_core.pydantic_v1 import BaseModel, Field from requests import Response -from langchain.callbacks.manager import CallbackManagerForChainRun, Callbacks from langchain.chains.api.openapi.requests_chain import APIRequesterChain from langchain.chains.api.openapi.response_chain import APIResponderChain from langchain.chains.base import Chain diff --git a/libs/langchain/langchain/chains/base.py b/libs/langchain/langchain/chains/base.py index 1d02272c01e..2afcac43b85 100644 --- a/libs/langchain/langchain/chains/base.py +++ b/libs/langchain/langchain/chains/base.py @@ -9,6 +9,14 @@ from typing import Any, Dict, List, Optional, Type, Union, cast import yaml from langchain_core._api import deprecated +from langchain_core.callbacks import ( + AsyncCallbackManager, + AsyncCallbackManagerForChainRun, + BaseCallbackManager, + CallbackManager, + CallbackManagerForChainRun, + Callbacks, +) from langchain_core.load.dump import dumpd from langchain_core.memory import BaseMemory from langchain_core.outputs import RunInfo @@ -26,14 +34,6 @@ from langchain_core.runnables import ( run_in_executor, ) -from langchain.callbacks.base import BaseCallbackManager -from langchain.callbacks.manager import ( - AsyncCallbackManager, - AsyncCallbackManagerForChainRun, - CallbackManager, - CallbackManagerForChainRun, - Callbacks, -) from langchain.schema import RUN_KEY logger = logging.getLogger(__name__) diff --git a/libs/langchain/langchain/chains/combine_documents/base.py b/libs/langchain/langchain/chains/combine_documents/base.py index 019d9a6e2b3..7285fced33f 100644 --- a/libs/langchain/langchain/chains/combine_documents/base.py +++ b/libs/langchain/langchain/chains/combine_documents/base.py @@ -3,15 +3,15 @@ from abc import ABC, abstractmethod from typing import Any, Dict, List, Optional, Tuple, Type +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, +) from langchain_core.documents import Document from langchain_core.prompts import BasePromptTemplate, PromptTemplate from langchain_core.pydantic_v1 import BaseModel, Field, create_model from langchain_core.runnables.config import RunnableConfig -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, -) from langchain.chains.base import Chain from langchain.text_splitter import RecursiveCharacterTextSplitter, TextSplitter diff --git a/libs/langchain/langchain/chains/combine_documents/map_reduce.py b/libs/langchain/langchain/chains/combine_documents/map_reduce.py index ef3a0fb7bf3..18be6d4cf27 100644 --- a/libs/langchain/langchain/chains/combine_documents/map_reduce.py +++ b/libs/langchain/langchain/chains/combine_documents/map_reduce.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Tuple, Type +from langchain_core.callbacks import Callbacks from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, Extra, create_model, root_validator from langchain_core.runnables.config import RunnableConfig -from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.combine_documents.reduce import ReduceDocumentsChain from langchain.chains.llm import LLMChain diff --git a/libs/langchain/langchain/chains/combine_documents/map_rerank.py b/libs/langchain/langchain/chains/combine_documents/map_rerank.py index d3ac0410942..0466aac56b9 100644 --- a/libs/langchain/langchain/chains/combine_documents/map_rerank.py +++ b/libs/langchain/langchain/chains/combine_documents/map_rerank.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Sequence, Tuple, Type, Union, cast +from langchain_core.callbacks import Callbacks from langchain_core.documents import Document from langchain_core.pydantic_v1 import BaseModel, Extra, create_model, root_validator from langchain_core.runnables.config import RunnableConfig -from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.llm import LLMChain from langchain.output_parsers.regex import RegexParser diff --git a/libs/langchain/langchain/chains/combine_documents/reduce.py b/libs/langchain/langchain/chains/combine_documents/reduce.py index 74e53c1fbd8..00e3efd02e0 100644 --- a/libs/langchain/langchain/chains/combine_documents/reduce.py +++ b/libs/langchain/langchain/chains/combine_documents/reduce.py @@ -4,10 +4,10 @@ from __future__ import annotations from typing import Any, Callable, List, Optional, Protocol, Tuple +from langchain_core.callbacks import Callbacks from langchain_core.documents import Document from langchain_core.pydantic_v1 import Extra -from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import BaseCombineDocumentsChain diff --git a/libs/langchain/langchain/chains/combine_documents/refine.py b/libs/langchain/langchain/chains/combine_documents/refine.py index 7a6c495328f..dc34e1594b0 100644 --- a/libs/langchain/langchain/chains/combine_documents/refine.py +++ b/libs/langchain/langchain/chains/combine_documents/refine.py @@ -4,12 +4,12 @@ from __future__ import annotations from typing import Any, Dict, List, Tuple +from langchain_core.callbacks import Callbacks from langchain_core.documents import Document from langchain_core.prompts import BasePromptTemplate, format_document from langchain_core.prompts.prompt import PromptTemplate from langchain_core.pydantic_v1 import Extra, Field, root_validator -from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import ( BaseCombineDocumentsChain, ) diff --git a/libs/langchain/langchain/chains/combine_documents/stuff.py b/libs/langchain/langchain/chains/combine_documents/stuff.py index 73183687e98..d965eb42197 100644 --- a/libs/langchain/langchain/chains/combine_documents/stuff.py +++ b/libs/langchain/langchain/chains/combine_documents/stuff.py @@ -1,6 +1,7 @@ """Chain that combines documents by stuffing into context.""" from typing import Any, Dict, List, Optional, Tuple +from langchain_core.callbacks import Callbacks from langchain_core.documents import Document from langchain_core.language_models import LanguageModelLike from langchain_core.output_parsers import BaseOutputParser, StrOutputParser @@ -8,7 +9,6 @@ from langchain_core.prompts import BasePromptTemplate, format_document from langchain_core.pydantic_v1 import Extra, Field, root_validator from langchain_core.runnables import Runnable, RunnablePassthrough -from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import ( DEFAULT_DOCUMENT_PROMPT, DEFAULT_DOCUMENT_SEPARATOR, diff --git a/libs/langchain/langchain/chains/constitutional_ai/base.py b/libs/langchain/langchain/chains/constitutional_ai/base.py index 33b3886f40d..90017cc7b53 100644 --- a/libs/langchain/langchain/chains/constitutional_ai/base.py +++ b/libs/langchain/langchain/chains/constitutional_ai/base.py @@ -1,10 +1,10 @@ """Chain for applying constitutional principles to the outputs of another chain.""" from typing import Any, Dict, List, Optional +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.constitutional_ai.models import ConstitutionalPrinciple from langchain.chains.constitutional_ai.principles import PRINCIPLES diff --git a/libs/langchain/langchain/chains/conversational_retrieval/base.py b/libs/langchain/langchain/chains/conversational_retrieval/base.py index 456186f9778..c92f18f7e85 100644 --- a/libs/langchain/langchain/chains/conversational_retrieval/base.py +++ b/libs/langchain/langchain/chains/conversational_retrieval/base.py @@ -7,6 +7,11 @@ from abc import abstractmethod from pathlib import Path from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, + Callbacks, +) from langchain_core.documents import Document from langchain_core.language_models import BaseLanguageModel from langchain_core.messages import BaseMessage @@ -16,11 +21,6 @@ from langchain_core.retrievers import BaseRetriever from langchain_core.runnables import RunnableConfig from langchain_core.vectorstores import VectorStore -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, - Callbacks, -) from langchain.chains.base import Chain from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.combine_documents.stuff import StuffDocumentsChain diff --git a/libs/langchain/langchain/chains/elasticsearch_database/base.py b/libs/langchain/langchain/chains/elasticsearch_database/base.py index 46c336808f1..f4e839125dd 100644 --- a/libs/langchain/langchain/chains/elasticsearch_database/base.py +++ b/libs/langchain/langchain/chains/elasticsearch_database/base.py @@ -3,16 +3,16 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, Dict, List, Optional +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.output_parsers import BaseLLMOutputParser +from langchain_core.output_parsers.json import SimpleJsonOutputParser from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Extra, root_validator -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.elasticsearch_database.prompts import ANSWER_PROMPT, DSL_PROMPT from langchain.chains.llm import LLMChain -from langchain.output_parsers.json import SimpleJsonOutputParser if TYPE_CHECKING: from elasticsearch import Elasticsearch diff --git a/libs/langchain/langchain/chains/ernie_functions/base.py b/libs/langchain/langchain/chains/ernie_functions/base.py index afed9d4257d..9a12b70c97a 100644 --- a/libs/langchain/langchain/chains/ernie_functions/base.py +++ b/libs/langchain/langchain/chains/ernie_functions/base.py @@ -13,19 +13,22 @@ from typing import ( cast, ) -from langchain_core.output_parsers import BaseGenerationOutputParser, BaseOutputParser +from langchain_core.language_models import BaseLanguageModel +from langchain_core.output_parsers import ( + BaseGenerationOutputParser, + BaseLLMOutputParser, + BaseOutputParser, +) +from langchain_core.prompts import BasePromptTemplate +from langchain_core.pydantic_v1 import BaseModel from langchain_core.runnables import Runnable -from langchain.base_language import BaseLanguageModel from langchain.chains import LLMChain from langchain.output_parsers.ernie_functions import ( JsonOutputFunctionsParser, PydanticAttrOutputFunctionsParser, PydanticOutputFunctionsParser, ) -from langchain.prompts import BasePromptTemplate -from langchain.pydantic_v1 import BaseModel -from langchain.schema import BaseLLMOutputParser from langchain.utils.ernie_functions import convert_pydantic_to_ernie_function PYTHON_TO_JSON_TYPES = { diff --git a/libs/langchain/langchain/chains/flare/base.py b/libs/langchain/langchain/chains/flare/base.py index 06b58ca6d06..c2ef8f2da60 100644 --- a/libs/langchain/langchain/chains/flare/base.py +++ b/libs/langchain/langchain/chains/flare/base.py @@ -6,15 +6,15 @@ from typing import Any, Dict, List, Optional, Sequence, Tuple import numpy as np from langchain_community.llms.openai import OpenAI +from langchain_core.callbacks import ( + CallbackManagerForChainRun, +) from langchain_core.language_models import BaseLanguageModel from langchain_core.outputs import Generation from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field from langchain_core.retrievers import BaseRetriever -from langchain.callbacks.manager import ( - CallbackManagerForChainRun, -) from langchain.chains.base import Chain from langchain.chains.flare.prompts import ( PROMPT, diff --git a/libs/langchain/langchain/chains/graph_qa/arangodb.py b/libs/langchain/langchain/chains/graph_qa/arangodb.py index ac797f71953..4c723e2046f 100644 --- a/libs/langchain/langchain/chains/graph_qa/arangodb.py +++ b/libs/langchain/langchain/chains/graph_qa/arangodb.py @@ -5,11 +5,11 @@ import re from typing import Any, Dict, List, Optional from langchain_community.graphs.arangodb_graph import ArangoGraph +from langchain_core.callbacks import CallbackManagerForChainRun +from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.base_language import BaseLanguageModel -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.prompts import ( AQL_FIX_PROMPT, diff --git a/libs/langchain/langchain/chains/graph_qa/cypher.py b/libs/langchain/langchain/chains/graph_qa/cypher.py index c15837cce66..3376e567308 100644 --- a/libs/langchain/langchain/chains/graph_qa/cypher.py +++ b/libs/langchain/langchain/chains/graph_qa/cypher.py @@ -5,11 +5,11 @@ import re from typing import Any, Dict, List, Optional from langchain_community.graphs.graph_store import GraphStore +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.cypher_utils import CypherQueryCorrector, Schema from langchain.chains.graph_qa.prompts import CYPHER_GENERATION_PROMPT, CYPHER_QA_PROMPT diff --git a/libs/langchain/langchain/chains/graph_qa/falkordb.py b/libs/langchain/langchain/chains/graph_qa/falkordb.py index 6c9f7110df7..b7ead3d8714 100644 --- a/libs/langchain/langchain/chains/graph_qa/falkordb.py +++ b/libs/langchain/langchain/chains/graph_qa/falkordb.py @@ -5,11 +5,11 @@ import re from typing import Any, Dict, List, Optional from langchain_community.graphs import FalkorDBGraph +from langchain_core.callbacks import CallbackManagerForChainRun +from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.base_language import BaseLanguageModel -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.prompts import CYPHER_GENERATION_PROMPT, CYPHER_QA_PROMPT from langchain.chains.llm import LLMChain diff --git a/libs/langchain/langchain/chains/graph_qa/hugegraph.py b/libs/langchain/langchain/chains/graph_qa/hugegraph.py index 0ca54111cb0..9e1f0249379 100644 --- a/libs/langchain/langchain/chains/graph_qa/hugegraph.py +++ b/libs/langchain/langchain/chains/graph_qa/hugegraph.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import Any, Dict, List, Optional from langchain_community.graphs.hugegraph import HugeGraph +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.prompts import ( CYPHER_QA_PROMPT, diff --git a/libs/langchain/langchain/chains/graph_qa/kuzu.py b/libs/langchain/langchain/chains/graph_qa/kuzu.py index 3735e822833..7df4cdc8465 100644 --- a/libs/langchain/langchain/chains/graph_qa/kuzu.py +++ b/libs/langchain/langchain/chains/graph_qa/kuzu.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import Any, Dict, List, Optional from langchain_community.graphs.kuzu_graph import KuzuGraph +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.prompts import CYPHER_QA_PROMPT, KUZU_GENERATION_PROMPT from langchain.chains.llm import LLMChain diff --git a/libs/langchain/langchain/chains/graph_qa/nebulagraph.py b/libs/langchain/langchain/chains/graph_qa/nebulagraph.py index d722c3a8510..e53eaefb35e 100644 --- a/libs/langchain/langchain/chains/graph_qa/nebulagraph.py +++ b/libs/langchain/langchain/chains/graph_qa/nebulagraph.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import Any, Dict, List, Optional from langchain_community.graphs.nebula_graph import NebulaGraph +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.prompts import CYPHER_QA_PROMPT, NGQL_GENERATION_PROMPT from langchain.chains.llm import LLMChain diff --git a/libs/langchain/langchain/chains/graph_qa/neptune_cypher.py b/libs/langchain/langchain/chains/graph_qa/neptune_cypher.py index 74985029d43..8fec19f5e1d 100644 --- a/libs/langchain/langchain/chains/graph_qa/neptune_cypher.py +++ b/libs/langchain/langchain/chains/graph_qa/neptune_cypher.py @@ -4,11 +4,11 @@ import re from typing import Any, Dict, List, Optional from langchain_community.graphs import NeptuneGraph +from langchain_core.callbacks import CallbackManagerForChainRun +from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts.base import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.base_language import BaseLanguageModel -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.prompts import ( CYPHER_QA_PROMPT, diff --git a/libs/langchain/langchain/chains/graph_qa/sparql.py b/libs/langchain/langchain/chains/graph_qa/sparql.py index 1d8150b4bab..f9d48970900 100644 --- a/libs/langchain/langchain/chains/graph_qa/sparql.py +++ b/libs/langchain/langchain/chains/graph_qa/sparql.py @@ -6,11 +6,11 @@ from __future__ import annotations from typing import Any, Dict, List, Optional from langchain_community.graphs.rdf_graph import RdfGraph +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts.base import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.graph_qa.prompts import ( SPARQL_GENERATION_SELECT_PROMPT, diff --git a/libs/langchain/langchain/chains/hyde/base.py b/libs/langchain/langchain/chains/hyde/base.py index a9573f6b068..ca658aea93c 100644 --- a/libs/langchain/langchain/chains/hyde/base.py +++ b/libs/langchain/langchain/chains/hyde/base.py @@ -7,12 +7,12 @@ from __future__ import annotations from typing import Any, Dict, List, Optional import numpy as np +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.embeddings import Embeddings from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Extra -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.hyde.prompts import PROMPT_MAP from langchain.chains.llm import LLMChain diff --git a/libs/langchain/langchain/chains/llm.py b/libs/langchain/langchain/chains/llm.py index 2d9908643a1..f1429028405 100644 --- a/libs/langchain/langchain/chains/llm.py +++ b/libs/langchain/langchain/chains/llm.py @@ -4,6 +4,13 @@ from __future__ import annotations import warnings from typing import Any, Dict, List, Optional, Sequence, Tuple, Union, cast +from langchain_core.callbacks import ( + AsyncCallbackManager, + AsyncCallbackManagerForChainRun, + CallbackManager, + CallbackManagerForChainRun, + Callbacks, +) from langchain_core.language_models import ( BaseLanguageModel, LanguageModelInput, @@ -24,13 +31,6 @@ from langchain_core.runnables import ( from langchain_core.runnables.configurable import DynamicRunnable from langchain_core.utils.input import get_colored_text -from langchain.callbacks.manager import ( - AsyncCallbackManager, - AsyncCallbackManagerForChainRun, - CallbackManager, - CallbackManagerForChainRun, - Callbacks, -) from langchain.chains.base import Chain diff --git a/libs/langchain/langchain/chains/llm_checker/base.py b/libs/langchain/langchain/chains/llm_checker/base.py index 4e718c73457..1d9166364e6 100644 --- a/libs/langchain/langchain/chains/llm_checker/base.py +++ b/libs/langchain/langchain/chains/llm_checker/base.py @@ -4,11 +4,11 @@ from __future__ import annotations import warnings from typing import Any, Dict, List, Optional +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import PromptTemplate from langchain_core.pydantic_v1 import Extra, root_validator -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.llm import LLMChain from langchain.chains.llm_checker.prompt import ( diff --git a/libs/langchain/langchain/chains/llm_math/base.py b/libs/langchain/langchain/chains/llm_math/base.py index 7e520ef0c4f..cada7dc3fa3 100644 --- a/libs/langchain/langchain/chains/llm_math/base.py +++ b/libs/langchain/langchain/chains/llm_math/base.py @@ -6,14 +6,14 @@ import re import warnings from typing import Any, Dict, List, Optional +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, +) from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Extra, root_validator -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, -) from langchain.chains.base import Chain from langchain.chains.llm import LLMChain from langchain.chains.llm_math.prompt import PROMPT diff --git a/libs/langchain/langchain/chains/llm_requests.py b/libs/langchain/langchain/chains/llm_requests.py index 8daf49f4eee..ed79f92f971 100644 --- a/libs/langchain/langchain/chains/llm_requests.py +++ b/libs/langchain/langchain/chains/llm_requests.py @@ -4,9 +4,9 @@ from __future__ import annotations from typing import Any, Dict, List, Optional from langchain_community.utilities.requests import TextRequestsWrapper +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.pydantic_v1 import Extra, Field, root_validator -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains import LLMChain from langchain.chains.base import Chain diff --git a/libs/langchain/langchain/chains/llm_summarization_checker/base.py b/libs/langchain/langchain/chains/llm_summarization_checker/base.py index a3659a53dbe..b5d1c1d504a 100644 --- a/libs/langchain/langchain/chains/llm_summarization_checker/base.py +++ b/libs/langchain/langchain/chains/llm_summarization_checker/base.py @@ -6,11 +6,11 @@ import warnings from pathlib import Path from typing import Any, Dict, List, Optional +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts.prompt import PromptTemplate from langchain_core.pydantic_v1 import Extra, root_validator -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.llm import LLMChain from langchain.chains.sequential import SequentialChain diff --git a/libs/langchain/langchain/chains/mapreduce.py b/libs/langchain/langchain/chains/mapreduce.py index f8e29b58aa7..0bcf9907ba6 100644 --- a/libs/langchain/langchain/chains/mapreduce.py +++ b/libs/langchain/langchain/chains/mapreduce.py @@ -7,12 +7,12 @@ from __future__ import annotations from typing import Any, Dict, List, Mapping, Optional +from langchain_core.callbacks import CallbackManagerForChainRun, Callbacks from langchain_core.documents import Document from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Extra -from langchain.callbacks.manager import CallbackManagerForChainRun, Callbacks from langchain.chains import ReduceDocumentsChain from langchain.chains.base import Chain from langchain.chains.combine_documents.base import BaseCombineDocumentsChain diff --git a/libs/langchain/langchain/chains/moderation.py b/libs/langchain/langchain/chains/moderation.py index c2935f3feb3..00d6cbd3f35 100644 --- a/libs/langchain/langchain/chains/moderation.py +++ b/libs/langchain/langchain/chains/moderation.py @@ -1,11 +1,11 @@ """Pass input through a moderation endpoint.""" from typing import Any, Dict, List, Optional +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.pydantic_v1 import root_validator +from langchain_core.utils import get_from_dict_or_env -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain -from langchain.utils import get_from_dict_or_env class OpenAIModerationChain(Chain): diff --git a/libs/langchain/langchain/chains/natbot/base.py b/libs/langchain/langchain/chains/natbot/base.py index 9e9d521e541..e74c3477b14 100644 --- a/libs/langchain/langchain/chains/natbot/base.py +++ b/libs/langchain/langchain/chains/natbot/base.py @@ -5,10 +5,10 @@ import warnings from typing import Any, Dict, List, Optional from langchain_community.llms.openai import OpenAI +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.pydantic_v1 import Extra, root_validator -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.llm import LLMChain from langchain.chains.natbot.prompt import PROMPT diff --git a/libs/langchain/langchain/chains/openai_functions/base.py b/libs/langchain/langchain/chains/openai_functions/base.py index e94f1fded24..7f8fdd4431b 100644 --- a/libs/langchain/langchain/chains/openai_functions/base.py +++ b/libs/langchain/langchain/chains/openai_functions/base.py @@ -10,6 +10,7 @@ from typing import ( ) from langchain_core._api import deprecated +from langchain_core.language_models import BaseLanguageModel from langchain_core.output_parsers import ( BaseGenerationOutputParser, BaseLLMOutputParser, @@ -23,7 +24,6 @@ from langchain_core.utils.function_calling import ( convert_to_openai_function, ) -from langchain.base_language import BaseLanguageModel from langchain.chains import LLMChain from langchain.output_parsers.openai_functions import ( JsonOutputFunctionsParser, diff --git a/libs/langchain/langchain/chains/openai_functions/openapi.py b/libs/langchain/langchain/chains/openai_functions/openapi.py index 549872f25b2..4b1bc2e7fac 100644 --- a/libs/langchain/langchain/chains/openai_functions/openapi.py +++ b/libs/langchain/langchain/chains/openai_functions/openapi.py @@ -8,12 +8,12 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Un import requests from langchain_community.chat_models import ChatOpenAI from langchain_community.utilities.openapi import OpenAPISpec +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate, ChatPromptTemplate from langchain_core.utils.input import get_colored_text from requests import Response -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.llm import LLMChain from langchain.chains.sequential import SequentialChain diff --git a/libs/langchain/langchain/chains/openai_tools/extraction.py b/libs/langchain/langchain/chains/openai_tools/extraction.py index 6e7ebe65a07..eda3e4bd59f 100644 --- a/libs/langchain/langchain/chains/openai_tools/extraction.py +++ b/libs/langchain/langchain/chains/openai_tools/extraction.py @@ -4,9 +4,9 @@ from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import ChatPromptTemplate from langchain_core.pydantic_v1 import BaseModel from langchain_core.runnables import Runnable +from langchain_core.utils.function_calling import convert_pydantic_to_openai_function from langchain.output_parsers import PydanticToolsParser -from langchain.utils.openai_functions import convert_pydantic_to_openai_function _EXTRACTION_TEMPLATE = """Extract and save the relevant entities mentioned \ in the following passage together with their properties. diff --git a/libs/langchain/langchain/chains/qa_generation/base.py b/libs/langchain/langchain/chains/qa_generation/base.py index cbb0eb36bac..d2ce08c80ec 100644 --- a/libs/langchain/langchain/chains/qa_generation/base.py +++ b/libs/langchain/langchain/chains/qa_generation/base.py @@ -3,11 +3,11 @@ from __future__ import annotations import json from typing import Any, Dict, List, Optional +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Field -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.base import Chain from langchain.chains.llm import LLMChain from langchain.chains.qa_generation.prompt import PROMPT_SELECTOR diff --git a/libs/langchain/langchain/chains/qa_with_sources/base.py b/libs/langchain/langchain/chains/qa_with_sources/base.py index 2144824a092..02a1b3aa0a4 100644 --- a/libs/langchain/langchain/chains/qa_with_sources/base.py +++ b/libs/langchain/langchain/chains/qa_with_sources/base.py @@ -7,15 +7,15 @@ import re from abc import ABC, abstractmethod from typing import Any, Dict, List, Optional, Tuple +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, +) from langchain_core.documents import Document from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import Extra, root_validator -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, -) from langchain.chains import ReduceDocumentsChain from langchain.chains.base import Chain from langchain.chains.combine_documents.base import BaseCombineDocumentsChain diff --git a/libs/langchain/langchain/chains/qa_with_sources/retrieval.py b/libs/langchain/langchain/chains/qa_with_sources/retrieval.py index a2b5c562652..9642f626ad6 100644 --- a/libs/langchain/langchain/chains/qa_with_sources/retrieval.py +++ b/libs/langchain/langchain/chains/qa_with_sources/retrieval.py @@ -2,14 +2,14 @@ from typing import Any, Dict, List +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, +) from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field from langchain_core.retrievers import BaseRetriever -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, -) from langchain.chains.combine_documents.stuff import StuffDocumentsChain from langchain.chains.qa_with_sources.base import BaseQAWithSourcesChain diff --git a/libs/langchain/langchain/chains/qa_with_sources/vector_db.py b/libs/langchain/langchain/chains/qa_with_sources/vector_db.py index 6feddc5bb77..31e97bbf22e 100644 --- a/libs/langchain/langchain/chains/qa_with_sources/vector_db.py +++ b/libs/langchain/langchain/chains/qa_with_sources/vector_db.py @@ -3,14 +3,14 @@ import warnings from typing import Any, Dict, List +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, +) from langchain_core.documents import Document from langchain_core.pydantic_v1 import Field, root_validator from langchain_core.vectorstores import VectorStore -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, -) from langchain.chains.combine_documents.stuff import StuffDocumentsChain from langchain.chains.qa_with_sources.base import BaseQAWithSourcesChain diff --git a/libs/langchain/langchain/chains/query_constructor/base.py b/libs/langchain/langchain/chains/query_constructor/base.py index ecbffe18163..d99c046abfa 100644 --- a/libs/langchain/langchain/chains/query_constructor/base.py +++ b/libs/langchain/langchain/chains/query_constructor/base.py @@ -7,6 +7,7 @@ from typing import Any, Callable, List, Optional, Sequence, Tuple, Union, cast from langchain_core.exceptions import OutputParserException from langchain_core.language_models import BaseLanguageModel from langchain_core.output_parsers import BaseOutputParser +from langchain_core.output_parsers.json import parse_and_check_json_markdown from langchain_core.prompts import BasePromptTemplate from langchain_core.prompts.few_shot import FewShotPromptTemplate from langchain_core.runnables import Runnable @@ -34,7 +35,6 @@ from langchain.chains.query_constructor.prompt import ( USER_SPECIFIED_EXAMPLE_PROMPT, ) from langchain.chains.query_constructor.schema import AttributeInfo -from langchain.output_parsers.json import parse_and_check_json_markdown class StructuredQueryOutputParser(BaseOutputParser[StructuredQuery]): diff --git a/libs/langchain/langchain/chains/question_answering/__init__.py b/libs/langchain/langchain/chains/question_answering/__init__.py index 3fd5070f1a7..34d6c917626 100644 --- a/libs/langchain/langchain/chains/question_answering/__init__.py +++ b/libs/langchain/langchain/chains/question_answering/__init__.py @@ -1,11 +1,10 @@ """Load question answering chains.""" from typing import Any, Mapping, Optional, Protocol +from langchain_core.callbacks import BaseCallbackManager, Callbacks from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate -from langchain.callbacks.base import BaseCallbackManager -from langchain.callbacks.manager import Callbacks from langchain.chains import ReduceDocumentsChain from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.combine_documents.map_reduce import MapReduceDocumentsChain diff --git a/libs/langchain/langchain/chains/retrieval_qa/base.py b/libs/langchain/langchain/chains/retrieval_qa/base.py index 94fd932078e..392a0b2cc44 100644 --- a/libs/langchain/langchain/chains/retrieval_qa/base.py +++ b/libs/langchain/langchain/chains/retrieval_qa/base.py @@ -6,6 +6,11 @@ import warnings from abc import abstractmethod from typing import Any, Dict, List, Optional +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, + Callbacks, +) from langchain_core.documents import Document from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import PromptTemplate @@ -13,11 +18,6 @@ from langchain_core.pydantic_v1 import Extra, Field, root_validator from langchain_core.retrievers import BaseRetriever from langchain_core.vectorstores import VectorStore -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, - Callbacks, -) from langchain.chains.base import Chain from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.combine_documents.stuff import StuffDocumentsChain diff --git a/libs/langchain/langchain/chains/router/base.py b/libs/langchain/langchain/chains/router/base.py index c2acb27f915..e6a9788d0f6 100644 --- a/libs/langchain/langchain/chains/router/base.py +++ b/libs/langchain/langchain/chains/router/base.py @@ -4,13 +4,13 @@ from __future__ import annotations from abc import ABC from typing import Any, Dict, List, Mapping, NamedTuple, Optional -from langchain_core.pydantic_v1 import Extra - -from langchain.callbacks.manager import ( +from langchain_core.callbacks import ( AsyncCallbackManagerForChainRun, CallbackManagerForChainRun, Callbacks, ) +from langchain_core.pydantic_v1 import Extra + from langchain.chains.base import Chain diff --git a/libs/langchain/langchain/chains/router/embedding_router.py b/libs/langchain/langchain/chains/router/embedding_router.py index a7efd41a5df..b8f9d975bd9 100644 --- a/libs/langchain/langchain/chains/router/embedding_router.py +++ b/libs/langchain/langchain/chains/router/embedding_router.py @@ -2,12 +2,12 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Sequence, Tuple, Type +from langchain_core.callbacks import CallbackManagerForChainRun from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.pydantic_v1 import Extra from langchain_core.vectorstores import VectorStore -from langchain.callbacks.manager import CallbackManagerForChainRun from langchain.chains.router.base import RouterChain diff --git a/libs/langchain/langchain/chains/router/llm_router.py b/libs/langchain/langchain/chains/router/llm_router.py index 03662160c1b..9443321827a 100644 --- a/libs/langchain/langchain/chains/router/llm_router.py +++ b/libs/langchain/langchain/chains/router/llm_router.py @@ -3,16 +3,16 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Type, cast +from langchain_core.callbacks import ( + AsyncCallbackManagerForChainRun, + CallbackManagerForChainRun, +) from langchain_core.exceptions import OutputParserException from langchain_core.language_models import BaseLanguageModel from langchain_core.output_parsers import BaseOutputParser from langchain_core.prompts import BasePromptTemplate from langchain_core.pydantic_v1 import root_validator -from langchain.callbacks.manager import ( - AsyncCallbackManagerForChainRun, - CallbackManagerForChainRun, -) from langchain.chains import LLMChain from langchain.chains.router.base import RouterChain from langchain.output_parsers.json import parse_and_check_json_markdown diff --git a/libs/langchain/langchain/chains/sequential.py b/libs/langchain/langchain/chains/sequential.py index d9462434fd4..29cf5dc04d4 100644 --- a/libs/langchain/langchain/chains/sequential.py +++ b/libs/langchain/langchain/chains/sequential.py @@ -1,13 +1,13 @@ """Chain pipeline where the outputs of one step feed directly into next.""" from typing import Any, Dict, List, Optional -from langchain_core.pydantic_v1 import Extra, root_validator -from langchain_core.utils.input import get_color_mapping - -from langchain.callbacks.manager import ( +from langchain_core.callbacks import ( AsyncCallbackManagerForChainRun, CallbackManagerForChainRun, ) +from langchain_core.pydantic_v1 import Extra, root_validator +from langchain_core.utils.input import get_color_mapping + from langchain.chains.base import Chain diff --git a/libs/langchain/langchain/chains/sql_database/prompt.py b/libs/langchain/langchain/chains/sql_database/prompt.py index 34cd2307b6b..d11740e4b4b 100644 --- a/libs/langchain/langchain/chains/sql_database/prompt.py +++ b/libs/langchain/langchain/chains/sql_database/prompt.py @@ -1,5 +1,5 @@ # flake8: noqa -from langchain.output_parsers.list import CommaSeparatedListOutputParser +from langchain_core.output_parsers.list import CommaSeparatedListOutputParser from langchain_core.prompts.prompt import PromptTemplate diff --git a/libs/langchain/langchain/chains/summarize/__init__.py b/libs/langchain/langchain/chains/summarize/__init__.py index ab17d07952c..9bc8b8118bd 100644 --- a/libs/langchain/langchain/chains/summarize/__init__.py +++ b/libs/langchain/langchain/chains/summarize/__init__.py @@ -1,10 +1,10 @@ """Load summarizing chains.""" from typing import Any, Mapping, Optional, Protocol +from langchain_core.callbacks import Callbacks from langchain_core.language_models import BaseLanguageModel from langchain_core.prompts import BasePromptTemplate -from langchain.callbacks.manager import Callbacks from langchain.chains.combine_documents.base import BaseCombineDocumentsChain from langchain.chains.combine_documents.map_reduce import MapReduceDocumentsChain from langchain.chains.combine_documents.reduce import ReduceDocumentsChain diff --git a/libs/langchain/langchain/chains/transform.py b/libs/langchain/langchain/chains/transform.py index e251cff2c93..17a51b205c5 100644 --- a/libs/langchain/langchain/chains/transform.py +++ b/libs/langchain/langchain/chains/transform.py @@ -3,12 +3,12 @@ import functools import logging from typing import Any, Awaitable, Callable, Dict, List, Optional -from langchain_core.pydantic_v1 import Field - -from langchain.callbacks.manager import ( +from langchain_core.callbacks import ( AsyncCallbackManagerForChainRun, CallbackManagerForChainRun, ) +from langchain_core.pydantic_v1 import Field + from langchain.chains.base import Chain logger = logging.getLogger(__name__)