fix: Ensure consistent template formatting for all content

app.py

@@ -216,22 +216,26 @@ with open("prompts.yaml", 'r') as stream:
             agent_templates[key] = {}
             for subkey, subvalue in value.items():
                 if isinstance(subvalue, str):
-                    # For system prompt, keep template syntax as is
-                    if key == 'system_prompt':
+                    # For all templates, ensure they are valid Jinja2 templates
+                    if '{{' in subvalue or '{%' in subvalue:
+                        # If template syntax exists, ensure proper spacing
+                        subvalue = re.sub(r'{{([^{}]+)}}', lambda m: '{{ ' + m.group(1).strip() + ' }}', subvalue)
+                        subvalue = re.sub(r'{%([^{}]+)%}', lambda m: '{% ' + m.group(1).strip() + ' %}', subvalue)
                         agent_templates[key][subkey] = subvalue
                     else:
-                        # For other templates, wrap non-template content in a simple template expression
-                        if '{{' in subvalue or '{%' in subvalue:
-                            agent_templates[key][subkey] = subvalue
-                        else:
-                            agent_templates[key][subkey] = '{{ "' + subvalue.replace('"', '\\"') + '" }}'
+                        # For non-template content, wrap in a simple template expression
+                        agent_templates[key][subkey] = '{{ "' + subvalue.replace('"', '\\"') + '" }}'
                 else:
                     agent_templates[key][subkey] = subvalue
         else:
             if isinstance(value, str):
                 if '{{' in value or '{%' in value:
+                    # If template syntax exists, ensure proper spacing
+                    value = re.sub(r'{{([^{}]+)}}', lambda m: '{{ ' + m.group(1).strip() + ' }}', value)
+                    value = re.sub(r'{%([^{}]+)%}', lambda m: '{% ' + m.group(1).strip() + ' %}', value)
                     agent_templates[key] = value
                 else:
+                    # For non-template content, wrap in a simple template expression
                     agent_templates[key] = '{{ "' + value.replace('"', '\\"') + '" }}'
             else:
                 agent_templates[key] = value