fix: simplify template processing to prevent double-wrapping and ensure proper spacing

app.py

@@ -90,23 +90,15 @@ with open("prompts.yaml", 'r') as stream:
         if not isinstance(template_content, str):
             return template_content
         
-        # For system prompts, we need to ensure they're properly formatted as templates
-        if is_system_prompt:
-            # If it's already a template (contains {{ or {%), return as is
-            if '{{' in template_content or '{%' in template_content:
-                return template_content
-            # Otherwise, wrap in double curly braces
-            return f"{{{{ {template_content} }}}}"
+        # If it's already a template (contains {{ or {%), return as is
+        if '{{' in template_content or '{%' in template_content:
+            # Just ensure proper spacing in template expressions
+            content = template_content
+            content = re.sub(r'{{([^{}]+)}}', r'{{ \1 }}', content)
+            content = re.sub(r'{%([^{}]+)%}', r'{% \1 %}', content)
+            return content
         
-        # For non-system prompts, if it contains no template expressions, return as is
-        if '{{' not in template_content and '{%' not in template_content:
-            return template_content
-        
-        # If it's already wrapped in double curly braces, return as is
-        if template_content.startswith('{{') and template_content.endswith('}}'):
-            return template_content
-        
-        # Otherwise, wrap in double curly braces
+        # For non-template strings, wrap in double curly braces
         return f"{{{{ {template_content} }}}}"
     
     logger.debug("Starting template processing...")
@@ -199,38 +191,12 @@ with open("prompts.yaml", 'r') as stream:
             agent_templates[key] = {}
             for subkey, subvalue in value.items():
                 if isinstance(subvalue, str):
-                    # Special handling for system prompt
-                    if key == 'system_prompt' and subkey == 'text':
-                        # Keep system prompt as is, only ensure proper spacing in template expressions
-                        content = subvalue
-                        content = re.sub(r'{{([^{}]+)}}', r'{{ \1 }}', content)
-                        content = re.sub(r'{%([^{}]+)%}', r'{% \1 %}', content)
-                    else:
-                        # For other templates, only wrap if not already a template
-                        content = subvalue
-                        if '{{' not in content and '{%' not in content:
-                            content = f'{{{{ "{content}" }}}}'
-                        else:
-                            # Ensure proper spacing in template expressions
-                            content = re.sub(r'{{([^{}]+)}}', r'{{ \1 }}', content)
-                            content = re.sub(r'{%([^{}]+)%}', r'{% \1 %}', content)
+                    # Process template with proper spacing
+                    content = process_template(subvalue, key == 'system_prompt')
                     agent_templates[key][subkey] = content
         elif isinstance(value, str):
-            # Special handling for system prompt
-            if key == 'system_prompt':
-                # Keep system prompt as is, only ensure proper spacing in template expressions
-                content = value
-                content = re.sub(r'{{([^{}]+)}}', r'{{ \1 }}', content)
-                content = re.sub(r'{%([^{}]+)%}', r'{% \1 %}', content)
-            else:
-                # For other templates, only wrap if not already a template
-                content = value
-                if '{{' not in content and '{%' not in content:
-                    content = f'{{{{ "{content}" }}}}'
-                else:
-                    # Ensure proper spacing in template expressions
-                    content = re.sub(r'{{([^{}]+)}}', r'{{ \1 }}', content)
-                    content = re.sub(r'{%([^{}]+)%}', r'{% \1 %}', content)
+            # Process template with proper spacing
+            content = process_template(value, key == 'system_prompt')
             agent_templates[key] = content
         else:
             agent_templates[key] = value