From 136b7e0a6ed914129898efa92d910d34ffdefded Mon Sep 17 00:00:00 2001
From: Sriniketh J <srinikethcr7@gmail.com>
Date: Fri, 24 Oct 2025 10:57:16 +0530
Subject: [PATCH] fix: prompt-builder - jinja2 template set vars still shows
 required

---
 .../components/builders/prompt_builder.py     | 10 +++++++--
 .../builders/test_prompt_builder.py           | 22 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/haystack/components/builders/prompt_builder.py b/haystack/components/builders/prompt_builder.py
index 3e1d3603ca..895237a80c 100644
--- a/haystack/components/builders/prompt_builder.py
+++ b/haystack/components/builders/prompt_builder.py
@@ -4,7 +4,7 @@
 
 from typing import Any, Literal, Optional, Union
 
-from jinja2 import meta
+from jinja2 import meta, nodes
 from jinja2.sandbox import SandboxedEnvironment
 
 from haystack import component, default_to_dict, logging
@@ -178,7 +178,13 @@ def __init__(
             # infer variables from template
             ast = self._env.parse(template)
             template_variables = meta.find_undeclared_variables(ast)
-            variables = list(template_variables)
+
+            assigned_variables = set()
+            for node in ast.find_all((nodes.Assign, nodes.For)):
+                if hasattr(node.target, "name"):
+                    assigned_variables.add(node.target.name)
+
+            variables = list(template_variables - assigned_variables)
         variables = variables or []
         self.variables = variables
 
diff --git a/test/components/builders/test_prompt_builder.py b/test/components/builders/test_prompt_builder.py
index 8a5504c5fc..2ff37b508f 100644
--- a/test/components/builders/test_prompt_builder.py
+++ b/test/components/builders/test_prompt_builder.py
@@ -337,3 +337,25 @@ def test_warning_no_required_variables(self, caplog):
         with caplog.at_level(logging.WARNING):
             _ = PromptBuilder(template="This is a {{ variable }}")
             assert "but `required_variables` is not set." in caplog.text
+
+    def test_template_assigned_variables_from_required_inputs(self) -> None:
+        template = """{% if existing_documents is not none %}
+                   {% set existing_doc_len = existing_documents|length %}
+                   {% else %}
+                   {% set existing_doc_len = 0 %}
+                   {% endif %}
+                   {% for doc in docs %}
+                   <document reference="{{loop.index + existing_doc_len}}">
+                    {{ doc.content }}
+                    </document>
+                   {% endfor %}
+                   """
+
+        builder = PromptBuilder(template=template, required_variables="*")
+        docs = [Document(content="Doc 1"), Document(content="Doc 2")]
+
+        res = builder.run(docs=docs, existing_documents=None)
+
+        assert "<document reference=" in res["prompt"]
+        assert "Doc 1" in res["prompt"]
+        assert "Doc 2" in res["prompt"]