From b885880344149b77ada22d5d5f58b2ed101ea6ca Mon Sep 17 00:00:00 2001 From: Erick Friis Date: Tue, 12 Dec 2023 15:31:14 -0800 Subject: [PATCH] templates[patch]: fix pydantic imports (#14632) --- templates/chat-bot-feedback/chat_bot_feedback/chain.py | 2 +- templates/plate-chain/plate_chain/utils.py | 2 +- templates/rag-conversation/rag_conversation/chain.py | 2 +- templates/rag-elasticsearch/rag_elasticsearch/chain.py | 2 +- templates/rag-self-query/rag_self_query/chain.py | 2 +- .../rag_timescale_conversation/chain.py | 2 +- .../rag_timescale_hybrid_search_time/chain.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/chat-bot-feedback/chat_bot_feedback/chain.py b/templates/chat-bot-feedback/chat_bot_feedback/chain.py index 5c4055d66f1..68eb75f4068 100644 --- a/templates/chat-bot-feedback/chat_bot_feedback/chain.py +++ b/templates/chat-bot-feedback/chat_bot_feedback/chain.py @@ -15,10 +15,10 @@ from langchain.schema import ( StrOutputParser, get_buffer_string, ) +from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.runnables import Runnable from langsmith.evaluation import EvaluationResult, RunEvaluator from langsmith.schemas import Example -from pydantic import BaseModel, Field ############################################################################### # | Chat Bot Evaluator Definition diff --git a/templates/plate-chain/plate_chain/utils.py b/templates/plate-chain/plate_chain/utils.py index 4ec485e561f..c2688776342 100644 --- a/templates/plate-chain/plate_chain/utils.py +++ b/templates/plate-chain/plate_chain/utils.py @@ -1,6 +1,6 @@ import json -from pydantic import BaseModel, Field, conint +from langchain_core.pydantic_v1 import BaseModel, Field, conint class LLMPlateResponse(BaseModel): diff --git a/templates/rag-conversation/rag_conversation/chain.py b/templates/rag-conversation/rag_conversation/chain.py index 2ae5d350016..2e5e5f28748 100644 --- a/templates/rag-conversation/rag_conversation/chain.py +++ b/templates/rag-conversation/rag_conversation/chain.py @@ -9,13 +9,13 @@ from langchain.prompts.prompt import PromptTemplate from langchain.schema import AIMessage, HumanMessage, format_document from langchain.vectorstores import Pinecone from langchain_core.output_parsers import StrOutputParser +from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.runnables import ( RunnableBranch, RunnableLambda, RunnableParallel, RunnablePassthrough, ) -from pydantic import BaseModel, Field if os.environ.get("PINECONE_API_KEY", None) is None: raise Exception("Missing `PINECONE_API_KEY` environment variable.") diff --git a/templates/rag-elasticsearch/rag_elasticsearch/chain.py b/templates/rag-elasticsearch/rag_elasticsearch/chain.py index 963e7854f03..2d33153d9b6 100644 --- a/templates/rag-elasticsearch/rag_elasticsearch/chain.py +++ b/templates/rag-elasticsearch/rag_elasticsearch/chain.py @@ -6,8 +6,8 @@ from langchain.embeddings import HuggingFaceEmbeddings from langchain.schema import BaseMessage, format_document from langchain.vectorstores.elasticsearch import ElasticsearchStore from langchain_core.output_parsers import StrOutputParser +from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.runnables import RunnableParallel, RunnablePassthrough -from pydantic import BaseModel, Field from .connection import es_connection_details from .prompts import CONDENSE_QUESTION_PROMPT, DOCUMENT_PROMPT, LLM_CONTEXT_PROMPT diff --git a/templates/rag-self-query/rag_self_query/chain.py b/templates/rag-self-query/rag_self_query/chain.py index 8e5e7cbe5ff..f4135728f19 100644 --- a/templates/rag-self-query/rag_self_query/chain.py +++ b/templates/rag-self-query/rag_self_query/chain.py @@ -8,8 +8,8 @@ from langchain.retrievers import SelfQueryRetriever from langchain.schema import format_document from langchain.vectorstores.elasticsearch import ElasticsearchStore from langchain_core.output_parsers import StrOutputParser +from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.runnables import RunnableParallel, RunnablePassthrough -from pydantic.v1 import BaseModel, Field from .prompts import CONDENSE_QUESTION_PROMPT, DOCUMENT_PROMPT, LLM_CONTEXT_PROMPT diff --git a/templates/rag-timescale-conversation/rag_timescale_conversation/chain.py b/templates/rag-timescale-conversation/rag_timescale_conversation/chain.py index 06363e401a0..e69f255e476 100644 --- a/templates/rag-timescale-conversation/rag_timescale_conversation/chain.py +++ b/templates/rag-timescale-conversation/rag_timescale_conversation/chain.py @@ -11,13 +11,13 @@ from langchain.prompts.prompt import PromptTemplate from langchain.schema import AIMessage, HumanMessage, format_document from langchain.vectorstores.timescalevector import TimescaleVector from langchain_core.output_parsers import StrOutputParser +from langchain_core.pydantic_v1 import BaseModel, Field from langchain_core.runnables import ( RunnableBranch, RunnableLambda, RunnableParallel, RunnablePassthrough, ) -from pydantic import BaseModel, Field from .load_sample_dataset import load_ts_git_dataset diff --git a/templates/rag-timescale-hybrid-search-time/rag_timescale_hybrid_search_time/chain.py b/templates/rag-timescale-hybrid-search-time/rag_timescale_hybrid_search_time/chain.py index 0e0cc868a36..a0a38eafc4c 100644 --- a/templates/rag-timescale-hybrid-search-time/rag_timescale_hybrid_search_time/chain.py +++ b/templates/rag-timescale-hybrid-search-time/rag_timescale_hybrid_search_time/chain.py @@ -11,8 +11,8 @@ from langchain.prompts import ChatPromptTemplate from langchain.retrievers.self_query.base import SelfQueryRetriever from langchain.vectorstores.timescalevector import TimescaleVector from langchain_core.output_parsers import StrOutputParser +from langchain_core.pydantic_v1 import BaseModel from langchain_core.runnables import RunnableParallel, RunnablePassthrough -from pydantic import BaseModel from .load_sample_dataset import load_ts_git_dataset