Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feat] Accept non-dict if only 1 prompt input variable #19156

Merged
merged 6 commits into from
Mar 20, 2024
Merged

[Feat] Accept non-dict if only 1 prompt input variable #19156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4c3bb8
Accept list
hinthornw Mar 15, 2024
5ece5f6
Merge branch 'master' into wfh/accept_messages_list
hinthornw Mar 18, 2024
a7494a9
lint
hinthornw Mar 18, 2024
1b9de31
add docstring example
hinthornw Mar 20, 2024
dfe5074
header?
hinthornw Mar 20, 2024
6e17775
fixup
hinthornw Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions libs/core/langchain_core/prompts/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,15 @@ def get_input_schema(

def _format_prompt_with_error_handling(self, inner_input: Dict) -> PromptValue:
if not isinstance(inner_input, dict):
raise TypeError(
f"Expected mapping type as input to {self.__class__.__name__}. "
f"Received {type(inner_input)}."
)
if len(self.input_variables) == 1:
var_name = self.input_variables[0]
inner_input = {var_name: inner_input}

else:
raise TypeError(
f"Expected mapping type as input to {self.__class__.__name__}. "
f"Received {type(inner_input)}."
)
missing = set(self.input_variables).difference(inner_input)
if missing:
raise KeyError(
Expand Down
13 changes: 13 additions & 0 deletions libs/core/tests/unit_tests/prompts/test_chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,3 +533,16 @@ def test_chat_prompt_message_placeholder_partial() -> None:
assert prompt.format_messages() == []
prompt = prompt.partial(history=[("system", "foo")])
assert prompt.format_messages() == [SystemMessage(content="foo")]


def test_messages_prompt_accepts_list() -> None:
prompt = ChatPromptTemplate.from_messages([MessagesPlaceholder("history")])
value = prompt.invoke([("user", "Hi there")]) # type: ignore
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

his is confusing -- are we sure we want to support?, why is it a list of 2-tuples rather than only a 2-tuple?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already support prompt.invoke({"history": [("user", "hi there"]})

assert value.to_messages() == [HumanMessage(content="Hi there")]

# Assert still raises a nice error
prompt = ChatPromptTemplate.from_messages(
[("system", "You are a {foo}"), MessagesPlaceholder("history")]
)
with pytest.raises(TypeError):
prompt.invoke([("user", "Hi there")])