fix: OutputParser when used within PromptTemplate (#7587)

* fix: extracting results from OutputParser * add reno
deepset-ai · Apr 23, 2024 · 5618d1e · 5618d1e
1 parent 32199b8
commit 5618d1e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/haystack/nodes/prompt/prompt_template.py b/haystack/nodes/prompt/prompt_template.py
@@ -539,8 +539,8 @@ def post_process(self, prompt_output: List[str], **kwargs) -> List[Any]:
         if self.output_parser:
             invocation_context = kwargs
             invocation_context["results"] = prompt_output
-            self.output_parser.run(invocation_context=invocation_context)
-            return invocation_context[self.output_parser.outputs[0]]
+            parser_results, _ = self.output_parser.run(invocation_context=invocation_context)
+            return parser_results[self.output_parser.outputs[0]]
         else:
             return prompt_output
 

diff --git a/releasenotes/notes/fix-output-parser-in-prompt-template-22975013f44c435b.yaml b/releasenotes/notes/fix-output-parser-in-prompt-template-22975013f44c435b.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixes OutputParser usage in PromptTemplate after making invocation context immutable in https://github.com/deepset-ai/haystack/pull/7510.
diff --git a/test/prompt/test_prompt_node.py b/test/prompt/test_prompt_node.py
@@ -432,7 +432,6 @@ def test_pipeline_with_prompt_template_at_query_time(prompt_model):
     )
 
 
-@pytest.mark.skip
 @pytest.mark.integration
 def test_pipeline_with_prompt_template_and_nested_shaper_yaml(tmp_path):
     # TODO: This can be a Shaper unit test?
@@ -444,7 +443,7 @@ def test_pipeline_with_prompt_template_and_nested_shaper_yaml(tmp_path):
             - name: template_with_nested_shaper
               type: PromptTemplate
               params:
-                prompt: "Given the context please answer the question. Context: {{documents}}; Question: {{query}}; Answer: "
+                prompt: "Given the context please answer the question. Context: {documents}; Question: {query}; Answer: "
                 output_parser:
                   type: AnswerParser
             - name: p1