fix: Rewrite template processing to handle code blocks separately

app.py

@@ -91,28 +91,44 @@ with open("prompts.yaml", 'r') as stream:
             try:
                 # First, ensure we have valid template syntax
                 if '{{' in value or '{%' in value:
-                    # Handle code blocks first
-                    value = re.sub(r'```([^`]+)```', lambda m: m.group(0).replace('\n', '\\n'), value)
+                    # Split the string into parts: code blocks and non-code blocks
+                    parts = []
+                    current_pos = 0
+                    code_block_pattern = r'```[^`]*```'
                     
-                    # Ensure template variables are properly formatted
-                    value = value.replace('{{', '{{ ').replace('}}', ' }}')
-                    # Ensure template blocks are properly formatted
-                    value = value.replace('{%', '{% ').replace('%}', ' %}')
+                    for match in re.finditer(code_block_pattern, value):
+                        # Add text before code block
+                        if match.start() > current_pos:
+                            parts.append(('text', value[current_pos:match.start()]))
+                        # Add code block
+                        parts.append(('code', match.group(0)))
+                        current_pos = match.end()
                     
-                    # Add spaces around template expressions if missing
-                    value = re.sub(r'{{([^{}]+)}}', lambda m: '{{ ' + m.group(1).strip() + ' }}', value)
-                    value = re.sub(r'{%([^{}]+)%}', lambda m: '{% ' + m.group(1).strip() + ' %}', value)
+                    # Add remaining text
+                    if current_pos < len(value):
+                        parts.append(('text', value[current_pos:]))
                     
-                    # Handle newlines in a way that preserves formatting
-                    value = value.replace('\n', '\\n')
-                    
-                    # Remove any double spaces except in code blocks
-                    value = re.sub(r'(?<!```)(\s+)(?!```)', ' ', value)
-                    
-                    # Restore code blocks
-                    value = value.replace('\\n```', '\n```')
-                    value = value.replace('```\\n', '```\n')
+                    # Process each part
+                    processed_parts = []
+                    for part_type, part_content in parts:
+                        if part_type == 'text':
+                            # Process template syntax in text parts
+                            processed = part_content
+                            # Ensure template variables are properly formatted
+                            processed = processed.replace('{{', '{{ ').replace('}}', ' }}')
+                            processed = processed.replace('{%', '{% ').replace('%}', ' %}')
+                            # Add spaces around template expressions
+                            processed = re.sub(r'{{([^{}]+)}}', lambda m: '{{ ' + m.group(1).strip() + ' }}', processed)
+                            processed = re.sub(r'{%([^{}]+)%}', lambda m: '{% ' + m.group(1).strip() + ' %}', processed)
+                            # Handle newlines
+                            processed = processed.replace('\n', '\\n')
+                            processed_parts.append(processed)
+                        else:
+                            # Keep code blocks as is
+                            processed_parts.append(part_content)
                     
+                    # Join all parts
+                    value = ''.join(processed_parts)
                     logger.debug(f"Processed template string: {value[:100]}...")
                 else:
                     logger.debug("No template syntax found in string")
@@ -153,19 +169,23 @@ with open("prompts.yaml", 'r') as stream:
                 for subkey, subvalue in value.items():
                     if isinstance(subvalue, str):
                         logger.debug(f"Validating template: {key}.{subkey}")
+                        logger.debug(f"Template content: {subvalue[:200]}...")
                         # Test template compilation
                         template = Template(subvalue, undefined=StrictUndefined)
                         # Test template rendering with dummy data
                         try:
-                            template.render(tools=[], task="test", name="test", final_answer="test", remaining_steps=1, answer_facts="test")
+                            rendered = template.render(tools=[], task="test", name="test", final_answer="test", remaining_steps=1, answer_facts="test")
+                            logger.debug(f"Template render test successful for {key}.{subkey}")
                         except Exception as e:
                             logger.error(f"Template render test failed for {key}.{subkey}: {str(e)}")
                             raise
             elif isinstance(value, str):
                 logger.debug(f"Validating template: {key}")
+                logger.debug(f"Template content: {value[:200]}...")
                 template = Template(value, undefined=StrictUndefined)
                 try:
-                    template.render(tools=[], task="test", name="test", final_answer="test", remaining_steps=1, answer_facts="test")
+                    rendered = template.render(tools=[], task="test", name="test", final_answer="test", remaining_steps=1, answer_facts="test")
+                    logger.debug(f"Template render test successful for {key}")
                 except Exception as e:
                     logger.error(f"Template render test failed for {key}: {str(e)}")
                     raise