fix: improve template processing to handle Jinja2 templates correctly

app.py

@@ -85,42 +85,29 @@ with open("prompts.yaml", 'r') as stream:
         raise ValueError("prompt_templates must be a dictionary")
     
     # Process templates to ensure they are valid Jinja2 templates
-    def process_template(value, is_system_prompt=False):
-        if isinstance(value, str):
-            logger.debug(f"Processing template string: {value[:100]}...")
-            try:
-                # Log the exact content before processing
-                logger.debug(f"Raw template content: {value}")
-                
-                # For system prompt, ensure proper spacing in template expressions
-                if is_system_prompt:
-                    # 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)
-                    value = value.replace('\n', '\\n')
-                else:
-                    # For other templates, only wrap non-template content
-                    if '{{' not in value and '{%' not in value:
-                        # Don't wrap in double curly braces, just return the string as is
-                        value = value
-                    else:
-                        # 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)
-                
-                logger.debug(f"Processed template content: {value}")
-            except Exception as e:
-                logger.error(f"Error processing template string: {str(e)}")
-                raise
-            return value
-        elif isinstance(value, dict):
-            logger.debug(f"Processing template dictionary with keys: {list(value.keys())}")
-            try:
-                return {k: process_template(v, is_system_prompt=(k == 'system_prompt')) for k, v in value.items()}
-            except Exception as e:
-                logger.error(f"Error processing template dictionary: {str(e)}")
-                raise
-        return value
+    def process_template(template_content, is_system_prompt=False):
+        """Process a template string to ensure it's properly formatted for Jinja2."""
+        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} }}}}"
+        
+        # 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
+        return f"{{{{ {template_content} }}}}"
     
     logger.debug("Starting template processing...")
     try: