fix: Convert non-template content to Jinja2 comments

app.py

@@ -91,44 +91,21 @@ with open("prompts.yaml", 'r') as stream:
             try:
                 # First, ensure we have valid template syntax
                 if '{{' in value or '{%' in value:
-                    # Split the string into parts: code blocks and non-code blocks
-                    parts = []
-                    current_pos = 0
-                    code_block_pattern = r'```[^`]*```'
+                    # Pre-process the template to ensure it's valid Jinja2
+                    # Replace any non-template content with a comment
+                    value = re.sub(r'(?<!{{|{%)([^{}]+)(?!}}|%})', lambda m: '{# ' + m.group(1) + ' #}', value)
                     
-                    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()
+                    # Ensure template variables are properly formatted
+                    value = value.replace('{{', '{{ ').replace('}}', ' }}')
+                    value = value.replace('{%', '{% ').replace('%}', ' %}')
                     
-                    # Add remaining text
-                    if current_pos < len(value):
-                        parts.append(('text', value[current_pos:]))
+                    # Add spaces around template expressions
+                    value = re.sub(r'{{([^{}]+)}}', lambda m: '{{ ' + m.group(1).strip() + ' }}', value)
+                    value = re.sub(r'{%([^{}]+)%}', lambda m: '{% ' + m.group(1).strip() + ' %}', value)
                     
-                    # 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)
+                    # Handle newlines
+                    value = value.replace('\n', '\\n')
                     
-                    # Join all parts
-                    value = ''.join(processed_parts)
                     logger.debug(f"Processed template string: {value[:100]}...")
                 else:
                     logger.debug("No template syntax found in string")
@@ -194,6 +171,14 @@ with open("prompts.yaml", 'r') as stream:
         logger.error(f"Template validation failed: {str(e)}")
         raise
 
+    # Pre-process the system prompt template
+    if 'system_prompt' in prompt_templates and 'text' in prompt_templates['system_prompt']:
+        system_prompt = prompt_templates['system_prompt']['text']
+        # Convert non-template content to comments
+        system_prompt = re.sub(r'(?<!{{|{%)([^{}]+)(?!}}|%})', lambda m: '{# ' + m.group(1) + ' #}', system_prompt)
+        prompt_templates['system_prompt']['text'] = system_prompt
+        logger.debug("Pre-processed system prompt template")
+
 agent = CodeAgent(
     model=model,
     tools=[final_answer, DuckDuckGoSearchTool(), calculate_min_price, extract_price_from_snippet, get_current_time_in_timezone],