fix: Handle system prompt template separately from other templates

app.py

@@ -85,23 +85,27 @@ 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):
+    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}")
                 
-                # 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)
-                
-                # Handle newlines
-                value = value.replace('\n', '\\n')
-                
-                # If no template syntax exists, wrap in a simple template expression
-                if '{{' not in value and '{%' not in value:
-                    value = f'{{{{ "{value}" }}}}'
+                # For system prompt, only ensure proper spacing in template expressions
+                if is_system_prompt:
+                    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, wrap non-template content
+                    if '{{' not in value and '{%' not in value:
+                        value = f'{{{{ "{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)
+                    value = value.replace('\n', '\\n')
                 
                 logger.debug(f"Processed template content: {value}")
             except Exception as e:
@@ -111,7 +115,7 @@ with open("prompts.yaml", 'r') as stream:
         elif isinstance(value, dict):
             logger.debug(f"Processing template dictionary with keys: {list(value.keys())}")
             try:
-                return {k: process_template(v) for k, v in value.items()}
+                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