fix: Ensure proper template formatting for all content

app.py

@@ -211,24 +211,27 @@ with open("prompts.yaml", 'r') as stream:
             agent_templates[key] = {}
             for subkey, subvalue in value.items():
                 if isinstance(subvalue, str):
-                    # Only process if template syntax exists
-                    if '{{' in subvalue or '{%' in subvalue:
-                        # Ensure proper spacing in template expressions
-                        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:
-                    agent_templates[key][subkey] = subvalue
-        else:
-            if isinstance(value, str):
-                # Only process if template syntax exists
-                if '{{' in value or '{%' in value:
                     # Ensure proper spacing in template expressions
-                    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:
-                agent_templates[key] = value
+                    content = subvalue
+                    # Add spaces around template expressions if missing
+                    content = re.sub(r'{{([^{}]+)}}', r'{{ \1 }}', content)
+                    content = re.sub(r'{%([^{}]+)%}', r'{% \1 %}', content)
+                    # Wrap non-template content in a simple template expression
+                    if '{{' not in content and '{%' not in content:
+                        content = f'{{{{ "{content.replace('"', '\\"')}" }}}}'
+                    agent_templates[key][subkey] = content
+        elif isinstance(value, str):
+            # Ensure proper spacing in template expressions
+            content = value
+            # Add spaces around template expressions if missing
+            content = re.sub(r'{{([^{}]+)}}', r'{{ \1 }}', content)
+            content = re.sub(r'{%([^{}]+)%}', r'{% \1 %}', content)
+            # Wrap non-template content in a simple template expression
+            if '{{' not in content and '{%' not in content:
+                content = f'{{{{ "{content.replace('"', '\\"')}" }}}}'
+            agent_templates[key] = content
+        else:
+            agent_templates[key] = value
 
     logger.debug("Templates for agent:")
     for key, value in agent_templates.items():
@@ -238,7 +241,7 @@ with open("prompts.yaml", 'r') as stream:
                 logger.debug(f"  {subkey}: {str(subvalue)[:200]}...")
         else:
             logger.debug(f"{key}: {str(value)[:200]}...")
-
+    
 agent = CodeAgent(
     model=model,
     tools=[final_answer, DuckDuckGoSearchTool(), calculate_min_price, extract_price_from_snippet, get_current_time_in_timezone],