upd: enhance general instruction module prompt

Author: csbobby

cli/decompose/prompt_modules/general_instructions/_general_instructions.py

@@ -13,27 +13,45 @@
 T = TypeVar("T")
 
 RE_GENERAL_INSTRUCTIONS = re.compile(
-    r"<general_instructions>(.+?)</general_instructions>",
+    r"<general_instructions>(.*?)</general_instructions>",
     flags=re.IGNORECASE | re.DOTALL,
 )
 
+RE_GENERAL_INSTRUCTIONS_OPEN = re.compile(
+    r"<general_instructions>(.*)",
+    flags=re.IGNORECASE | re.DOTALL,
+)
+
+RE_FINAL_SENTENCE = re.compile(
+    r"\n*All tags are closed and my assignment is finished\.\s*$",
+    flags=re.IGNORECASE,
+)
+
 
 @final
 class _GeneralInstructions(PromptModule):
     @staticmethod
     def _default_parser(generated_str: str) -> str:
         general_instructions_match = re.search(RE_GENERAL_INSTRUCTIONS, generated_str)
 
-        general_instructions_str: str | None = (
-            general_instructions_match.group(1).strip()
-            if general_instructions_match
-            else None
-        )
-
-        if general_instructions_str is None:
-            raise TagExtractionError(
-                'LLM failed to generate correct tags for extraction: "<general_instructions>"'
+        if general_instructions_match:
+            general_instructions_str = general_instructions_match.group(1).strip()
+        else:
+            # fallback: opening tag only (in case the closing tag is missing)
+            general_instructions_match = re.search(
+                RE_GENERAL_INSTRUCTIONS_OPEN, generated_str
             )
+            if not general_instructions_match:
+                raise TagExtractionError(
+                    'LLM failed to generate correct tags for extraction: "<general_instructions>"'
+                )
+            general_instructions_str = general_instructions_match.group(1).strip()
+
+        general_instructions_str = re.sub(
+            RE_FINAL_SENTENCE,
+            "",
+            general_instructions_str,
+        ).strip()
 
         return general_instructions_str
 
@@ -50,20 +68,22 @@ def generate(
 
         system_prompt = get_system_prompt()
         user_prompt = get_user_prompt(task_prompt=input_str)
-
         action = Message("user", user_prompt)
 
+        model_options = {
+            ModelOption.SYSTEM_PROMPT: system_prompt,
+            ModelOption.TEMPERATURE: 0,
+            ModelOption.MAX_NEW_TOKENS: max_new_tokens,
+        }
+
         try:
-            gen_result = mellea_session.act(
+            response = mellea_session.act(
                 action=action,
-                model_options={
-                    ModelOption.SYSTEM_PROMPT: system_prompt,
-                    ModelOption.TEMPERATURE: 0,
-                    ModelOption.MAX_NEW_TOKENS: max_new_tokens,
-                },
-            ).value
+                model_options=model_options,
+            )
+            gen_result = response.value
         except Exception as e:
-            raise BackendGenerationError(f"LLM generation failed: {e}")
+            raise BackendGenerationError(f"LLM generation failed: {e}") from e
 
         if gen_result is None:
             raise BackendGenerationError(
@@ -73,4 +93,4 @@ def generate(
         return PromptModuleString(gen_result, parser)
 
 
-general_instructions = _GeneralInstructions()
+general_instructions = _GeneralInstructions()

cli/decompose/prompt_modules/general_instructions/_prompt/system_template.jinja2

@@ -13,7 +13,7 @@ Do not write anything between </general_instructions> and the final sentence exc
 Here are some complete examples to guide you on how to complete your assignment:
 
 {% for item in icl_examples -%}
-<example>
+<example_{{ loop.index }}>
 <task_prompt>
 {{ item["task_prompt"] }}
 </task_prompt>
@@ -22,7 +22,7 @@ Here are some complete examples to guide you on how to complete your assignment:
 </general_instructions>
 
 All tags are closed and my assignment is finished.
-</example>
+</example_{{ loop.index }}>
 
 {% endfor -%}
 That concludes the complete examples of your assignment.