github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-07-03 19:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

langchain[patch]: agents check prompt partial vars (#20303)

Browse Source
This commit is contained in:
Bagatur 2024-04-11 03:55:09 -07:00 committed by GitHub
parent cb25fa0d55
commit e936fba428
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/langchain/langchain/agents/json_chat/base.py
View File

@ -155,7 +155,7 @@ def create_json_chat_agent(
) )
""" # noqa: E501 """ # noqa: E501
missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference( missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference(
prompt.input_variables prompt.input_variables + list(prompt.partial_variables)
) )
if missing_vars: if missing_vars:
raise ValueError(f"Prompt missing required variables: {missing_vars}") raise ValueError(f"Prompt missing required variables: {missing_vars}")

4
libs/langchain/langchain/agents/openai_functions_agent/base.py
View File

@ -298,7 +298,9 @@ def create_openai_functions_agent(
] ]
) )
""" """
if "agent_scratchpad" not in prompt.input_variables: if "agent_scratchpad" not in (
prompt.input_variables + list(prompt.partial_variables)
):
raise ValueError( raise ValueError(
"Prompt must have input variable `agent_scratchpad`, but wasn't found. " "Prompt must have input variable `agent_scratchpad`, but wasn't found. "
f"Found {prompt.input_variables} instead." f"Found {prompt.input_variables} instead."

4
libs/langchain/langchain/agents/openai_tools/base.py
View File

@ -78,7 +78,9 @@ def create_openai_tools_agent(
] ]
) )
""" """
missing_vars = {"agent_scratchpad"}.difference(prompt.input_variables) missing_vars = {"agent_scratchpad"}.difference(
prompt.input_variables + list(prompt.partial_variables)
)
if missing_vars: if missing_vars:
raise ValueError(f"Prompt missing required variables: {missing_vars}") raise ValueError(f"Prompt missing required variables: {missing_vars}")

2
libs/langchain/langchain/agents/react/agent.py
View File

@ -108,7 +108,7 @@ def create_react_agent(
prompt = PromptTemplate.from_template(template) prompt = PromptTemplate.from_template(template)
""" # noqa: E501 """ # noqa: E501
missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference( missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference(
prompt.input_variables prompt.input_variables + list(prompt.partial_variables)
) )
if missing_vars: if missing_vars:
raise ValueError(f"Prompt missing required variables: {missing_vars}") raise ValueError(f"Prompt missing required variables: {missing_vars}")

4
libs/langchain/langchain/agents/self_ask_with_search/base.py
View File

@ -173,7 +173,9 @@ def create_self_ask_with_search_agent(
prompt = PromptTemplate.from_template(template) prompt = PromptTemplate.from_template(template)
""" # noqa: E501 """ # noqa: E501
missing_vars = {"agent_scratchpad"}.difference(prompt.input_variables) missing_vars = {"agent_scratchpad"}.difference(
prompt.input_variables + list(prompt.partial_variables)
)
if missing_vars: if missing_vars:
raise ValueError(f"Prompt missing required variables: {missing_vars}") raise ValueError(f"Prompt missing required variables: {missing_vars}")

2
libs/langchain/langchain/agents/structured_chat/base.py
View File

@ -273,7 +273,7 @@ def create_structured_chat_agent(
) )
""" # noqa: E501 """ # noqa: E501
missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference( missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference(
prompt.input_variables prompt.input_variables + list(prompt.partial_variables)
) )
if missing_vars: if missing_vars:
raise ValueError(f"Prompt missing required variables: {missing_vars}") raise ValueError(f"Prompt missing required variables: {missing_vars}")

10
libs/langchain/langchain/agents/tool_calling_agent/base.py
View File

@ -33,14 +33,14 @@ def create_tool_calling_agent(
from langchain.agents import AgentExecutor, create_tool_calling_agent, tool from langchain.agents import AgentExecutor, create_tool_calling_agent, tool
from langchain_anthropic import ChatAnthropic from langchain_anthropic import ChatAnthropic
from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder from langchain_core.prompts import ChatPromptTemplate
prompt = ChatPromptTemplate.from_messages( prompt = ChatPromptTemplate.from_messages(
[ [
("system", "You are a helpful assistant"), ("system", "You are a helpful assistant"),
MessagesPlaceholder("chat_history", optional=True), ("placeholder", "{chat_history}",
("human", "{input}"), ("human", "{input}"),
MessagesPlaceholder("agent_scratchpad"), ("placeholder", "{agent_scratchpad}"),
] ]
) )
model = ChatAnthropic(model="claude-3-opus-20240229") model = ChatAnthropic(model="claude-3-opus-20240229")
@ -75,7 +75,9 @@ def create_tool_calling_agent(
``MessagesPlaceholder``. Intermediate agent actions and tool output ``MessagesPlaceholder``. Intermediate agent actions and tool output
messages will be passed in here. messages will be passed in here.
""" """
missing_vars = {"agent_scratchpad"}.difference(prompt.input_variables) missing_vars = {"agent_scratchpad"}.difference(
prompt.input_variables + list(prompt.partial_variables)
)
if missing_vars: if missing_vars:
raise ValueError(f"Prompt missing required variables: {missing_vars}") raise ValueError(f"Prompt missing required variables: {missing_vars}")

4
libs/langchain/langchain/agents/xml/base.py
View File

@ -203,7 +203,9 @@ def create_xml_agent(
{agent_scratchpad}''' {agent_scratchpad}'''
prompt = PromptTemplate.from_template(template) prompt = PromptTemplate.from_template(template)
""" # noqa: E501 """ # noqa: E501
missing_vars = {"tools", "agent_scratchpad"}.difference(prompt.input_variables) missing_vars = {"tools", "agent_scratchpad"}.difference(
prompt.input_variables + list(prompt.partial_variables)
)
if missing_vars: if missing_vars:
raise ValueError(f"Prompt missing required variables: {missing_vars}") raise ValueError(f"Prompt missing required variables: {missing_vars}")