diff --git a/examples/agent/server.py b/examples/agent/server.py index 2eb32fc1..f5fb4a28 100755 --- a/examples/agent/server.py +++ b/examples/agent/server.py @@ -23,12 +23,12 @@ from langchain.agents import AgentExecutor from langchain.agents.format_scratchpad import format_to_openai_functions from langchain.agents.output_parsers import OpenAIFunctionsAgentOutputParser -from langchain.pydantic_v1 import BaseModel from langchain_community.vectorstores import FAISS from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder from langchain_core.tools import tool from langchain_core.utils.function_calling import format_tool_to_openai_function from langchain_openai import ChatOpenAI, OpenAIEmbeddings +from pydantic import BaseModel from langserve import add_routes diff --git a/examples/agent_custom_streaming/server.py b/examples/agent_custom_streaming/server.py index 736a0858..1e0226b2 100755 --- a/examples/agent_custom_streaming/server.py +++ b/examples/agent_custom_streaming/server.py @@ -57,9 +57,9 @@ from langchain_core.tools import tool from langchain_core.utils.function_calling import format_tool_to_openai_tool from langchain_openai import ChatOpenAI +from pydantic import BaseModel from langserve import add_routes -from langserve.pydantic_v1 import BaseModel prompt = ChatPromptTemplate.from_messages( [ diff --git a/examples/agent_with_history/server.py b/examples/agent_with_history/server.py index 5435e1f3..cec4e94b 100755 --- a/examples/agent_with_history/server.py +++ b/examples/agent_with_history/server.py @@ -36,9 +36,9 @@ from langchain_core.tools import tool from langchain_core.utils.function_calling import format_tool_to_openai_tool from langchain_openai import ChatOpenAI +from pydantic import BaseModel, Field from langserve import add_routes -from langserve.pydantic_v1 import BaseModel, Field prompt = ChatPromptTemplate.from_messages( [ diff --git a/examples/auth/api_handler/server.py b/examples/auth/api_handler/server.py index 862cbbe4..e2fcf667 100755 --- a/examples/auth/api_handler/server.py +++ b/examples/auth/api_handler/server.py @@ -44,10 +44,10 @@ ) from langchain_core.vectorstores import VectorStore from langchain_openai import OpenAIEmbeddings +from pydantic import BaseModel, ConfigDict from typing_extensions import Annotated from langserve import APIHandler -from langserve.pydantic_v1 import BaseModel class User(BaseModel): @@ -150,10 +150,9 @@ class PerUserVectorstore(RunnableSerializable): user_id: Optional[str] vectorstore: VectorStore - class Config: - # Allow arbitrary types since VectorStore is an abstract interface - # and not a pydantic model - arbitrary_types_allowed = True + model_config = ConfigDict( + arbitrary_types_allowed=True, + ) def _invoke( self, input: str, config: Optional[RunnableConfig] = None, **kwargs: Any diff --git a/examples/auth/per_req_config_modifier/server.py b/examples/auth/per_req_config_modifier/server.py index 26f90e01..6631a8d0 100755 --- a/examples/auth/per_req_config_modifier/server.py +++ b/examples/auth/per_req_config_modifier/server.py @@ -45,10 +45,10 @@ ) from langchain_core.vectorstores import VectorStore from langchain_openai import OpenAIEmbeddings +from pydantic import BaseModel, ConfigDict from typing_extensions import Annotated from langserve import add_routes -from langserve.pydantic_v1 import BaseModel class User(BaseModel): @@ -147,10 +147,9 @@ class PerUserVectorstore(RunnableSerializable): user_id: Optional[str] vectorstore: VectorStore - class Config: - # Allow arbitrary types since VectorStore is an abstract interface - # and not a pydantic model - arbitrary_types_allowed = True + model_config = ConfigDict( + arbitrary_types_allowed=True, + ) def _invoke( self, input: str, config: Optional[RunnableConfig] = None, **kwargs: Any diff --git a/examples/chat_playground/legacy_input/server.py b/examples/chat_playground/legacy_input/server.py index 415259b8..0183928b 100644 --- a/examples/chat_playground/legacy_input/server.py +++ b/examples/chat_playground/legacy_input/server.py @@ -8,9 +8,9 @@ from langchain_anthropic import ChatAnthropic from langchain_core.messages import AIMessage, HumanMessage, SystemMessage from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder +from pydantic import BaseModel, Field from langserve import add_routes -from langserve.pydantic_v1 import BaseModel, Field app = FastAPI( title="LangChain Server", diff --git a/examples/chat_playground/server.py b/examples/chat_playground/server.py index ddf6aafb..89a08ecc 100755 --- a/examples/chat_playground/server.py +++ b/examples/chat_playground/server.py @@ -8,9 +8,9 @@ from langchain_anthropic.chat_models import ChatAnthropic from langchain_core.messages import AIMessage, HumanMessage, SystemMessage from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder +from pydantic import BaseModel, Field from langserve import add_routes -from langserve.pydantic_v1 import BaseModel, Field app = FastAPI( title="LangChain Server", diff --git a/examples/chat_with_persistence/server.py b/examples/chat_with_persistence/server.py index b2c87e75..b239ec32 100755 --- a/examples/chat_with_persistence/server.py +++ b/examples/chat_with_persistence/server.py @@ -18,9 +18,9 @@ from langchain_core.chat_history import BaseChatMessageHistory from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder from langchain_core.runnables.history import RunnableWithMessageHistory +from pydantic import BaseModel, Field from langserve import add_routes -from langserve.pydantic_v1 import BaseModel, Field def _is_valid_identifier(value: str) -> bool: diff --git a/examples/configurable_agent_executor/server.py b/examples/configurable_agent_executor/server.py index 7ce73651..d215efcb 100755 --- a/examples/configurable_agent_executor/server.py +++ b/examples/configurable_agent_executor/server.py @@ -20,7 +20,6 @@ from langchain.agents import AgentExecutor from langchain.agents.format_scratchpad import format_to_openai_functions from langchain.agents.output_parsers import OpenAIFunctionsAgentOutputParser -from langchain.pydantic_v1 import BaseModel from langchain_community.vectorstores import FAISS from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder from langchain_core.runnables import ( @@ -33,6 +32,7 @@ from langchain_core.tools import tool from langchain_core.utils.function_calling import format_tool_to_openai_function from langchain_openai import ChatOpenAI, OpenAIEmbeddings +from pydantic import BaseModel from langserve import add_routes diff --git a/examples/configurable_retrieval/server.py b/examples/configurable_retrieval/server.py index c6e227cc..72e1db5d 100755 --- a/examples/configurable_retrieval/server.py +++ b/examples/configurable_retrieval/server.py @@ -15,9 +15,9 @@ ) from langchain_core.vectorstores import VectorStore from langchain_openai import OpenAIEmbeddings +from pydantic import BaseModel, Field from langserve import add_routes -from langserve.pydantic_v1 import BaseModel, Field vectorstore1 = FAISS.from_texts( ["cats like fish", "dogs like sticks"], embedding=OpenAIEmbeddings() diff --git a/examples/conversational_retrieval_chain/server.py b/examples/conversational_retrieval_chain/server.py index e3cc1d95..e4c75874 100755 --- a/examples/conversational_retrieval_chain/server.py +++ b/examples/conversational_retrieval_chain/server.py @@ -18,9 +18,9 @@ from langchain_core.prompts import ChatPromptTemplate, PromptTemplate, format_document from langchain_core.runnables import RunnableMap, RunnablePassthrough from langchain_openai import ChatOpenAI, OpenAIEmbeddings +from pydantic import BaseModel, Field from langserve import add_routes -from langserve.pydantic_v1 import BaseModel, Field _TEMPLATE = """Given the following conversation and a follow up question, rephrase the follow up question to be a standalone question, in its original language. diff --git a/examples/file_processing/server.py b/examples/file_processing/server.py index c3ee4a30..4645291b 100755 --- a/examples/file_processing/server.py +++ b/examples/file_processing/server.py @@ -15,10 +15,10 @@ import base64 from fastapi import FastAPI -from langchain.pydantic_v1 import Field from langchain_community.document_loaders.parsers.pdf import PDFMinerParser from langchain_core.document_loaders import Blob from langchain_core.runnables import RunnableLambda +from pydantic import Field from langserve import CustomUserType, add_routes diff --git a/examples/widgets/chat/message_list/server.py b/examples/widgets/chat/message_list/server.py index bc23463b..40fc1045 100755 --- a/examples/widgets/chat/message_list/server.py +++ b/examples/widgets/chat/message_list/server.py @@ -10,9 +10,9 @@ from langchain_core.messages import AIMessage, HumanMessage, SystemMessage from langchain_core.output_parsers import StrOutputParser from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder +from pydantic import BaseModel, Field from langserve import add_routes -from langserve.pydantic_v1 import BaseModel, Field app = FastAPI( title="LangChain Server", diff --git a/examples/widgets/chat/tuples/server.py b/examples/widgets/chat/tuples/server.py index 8f80b264..1fbeffd3 100755 --- a/examples/widgets/chat/tuples/server.py +++ b/examples/widgets/chat/tuples/server.py @@ -6,7 +6,6 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from langchain.pydantic_v1 import BaseModel, Field from langchain_community.document_loaders.parsers.pdf import PDFMinerParser from langchain_core.document_loaders import Blob from langchain_core.messages import ( @@ -17,6 +16,7 @@ ) from langchain_core.runnables import RunnableLambda, RunnableParallel from langchain_openai import ChatOpenAI +from pydantic import BaseModel, Field from langserve import CustomUserType from langserve.server import add_routes