From f77a26c53841430115a7a8e584f6a344a9feae4a Mon Sep 17 00:00:00 2001 From: Alejandro Rodriguez Date: Wed, 4 Sep 2024 16:01:51 -0400 Subject: [PATCH 1/2] [core] fix "template" not allowed as prompt param --- libs/core/langchain_core/prompts/string.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/core/langchain_core/prompts/string.py b/libs/core/langchain_core/prompts/string.py index b2377512c5402..1fc4e08273340 100644 --- a/libs/core/langchain_core/prompts/string.py +++ b/libs/core/langchain_core/prompts/string.py @@ -16,7 +16,7 @@ from langchain_core.utils.interactive_env import is_interactive_env -def jinja2_formatter(template: str, **kwargs: Any) -> str: +def jinja2_formatter(template: str, /, **kwargs: Any) -> str: """Format a template using jinja2. *Security warning*: @@ -98,7 +98,7 @@ def _get_jinja2_variables_from_template(template: str) -> Set[str]: return variables -def mustache_formatter(template: str, **kwargs: Any) -> str: +def mustache_formatter(template: str, /, **kwargs: Any) -> str: """Format a template using mustache. Args: From 29f8ced5b5d1839fd605de80a9fefdb7cf0555d4 Mon Sep 17 00:00:00 2001 From: Erick Friis Date: Fri, 20 Sep 2024 16:29:36 -0700 Subject: [PATCH 2/2] x --- .../tests/unit_tests/prompts/test_prompt.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libs/core/tests/unit_tests/prompts/test_prompt.py b/libs/core/tests/unit_tests/prompts/test_prompt.py index e0fb05f11a589..7918658673478 100644 --- a/libs/core/tests/unit_tests/prompts/test_prompt.py +++ b/libs/core/tests/unit_tests/prompts/test_prompt.py @@ -640,3 +640,22 @@ def test_prompt_missing_vars_error() -> None: # Check helper text has right number of braces assert "'{{goingtobemissing}}'" in str(e.value.args[0]) + + +def test_prompt_with_template_variable_name_fstring() -> None: + template = "This is a {template} test." + prompt = PromptTemplate.from_template(template, template_format="f-string") + assert prompt.invoke({"template": "bar"}).to_string() == "This is a bar test." + + +def test_prompt_with_template_variable_name_mustache() -> None: + template = "This is a {{template}} test." + prompt = PromptTemplate.from_template(template, template_format="mustache") + assert prompt.invoke({"template": "bar"}).to_string() == "This is a bar test." + + +@pytest.mark.requires("jinja2") +def test_prompt_with_template_variable_name_jinja2() -> None: + template = "This is a {{template}} test." + prompt = PromptTemplate.from_template(template, template_format="jinja2") + assert prompt.invoke({"template": "bar"}).to_string() == "This is a bar test."