Update tools/form_filler_server.py

tools/form_filler_server.py

@@ -1,5 +1,6 @@
 from typing import Dict, Any
 import json
+from pathlib import Path
 from docx import Document
 from openpyxl import load_workbook
 
@@ -39,23 +40,44 @@ async def fill_docx_form(template_path: str, data: Dict[str, Any], output_path:
         
         # Replace in paragraphs
         for paragraph in doc.paragraphs:
+            original_text = paragraph.text
+            modified = False
+            
             for key, value in data.items():
-                placeholder = f"{{{{{key}}}}}"  # {{field_name}}
-                if placeholder in paragraph.text:
-                    paragraph.text = paragraph.text.replace(placeholder, str(value))
-                    fields_filled.append(key)
+                # Try multiple placeholder formats
+                placeholders = [
+                    f"{{{{{key}}}}}",  # {{field_name}}
+                    f"{{{key}}}",      # {field_name}
+                    key                # field_name
+                ]
+                
+                for placeholder in placeholders:
+                    if placeholder in paragraph.text:
+                        paragraph.text = paragraph.text.replace(placeholder, str(value))
+                        modified = True
+                        if key not in fields_filled:
+                            fields_filled.append(key)
         
         # Replace in tables
         for table in doc.tables:
             for row in table.rows:
                 for cell in row.cells:
-                    for key, value in data.items():
-                        placeholder = f"{{{{{key}}}}}"
-                        if placeholder in cell.text:
-                            cell.text = cell.text.replace(placeholder, str(value))
-                            if key not in fields_filled:
-                                fields_filled.append(key)
-        
+                    for paragraph in cell.paragraphs:
+                        for key, value in data.items():
+                            placeholders = [
+                                f"{{{{{key}}}}}",
+                                f"{{{key}}}",
+                                key
+                            ]
+                            
+                            for placeholder in placeholders:
+                                if placeholder in paragraph.text:
+                                    paragraph.text = paragraph.text.replace(placeholder, str(value))
+                                    if key not in fields_filled:
+                                        fields_filled.append(key)
+        
+        # Ensure output directory exists
+        Path(output_path).parent.mkdir(parents=True, exist_ok=True)
         doc.save(output_path)
         
         return {
@@ -81,11 +103,20 @@ async def fill_excel_form(template_path: str, data: Dict[str, Any], output_path:
             for cell in row:
                 if cell.value and isinstance(cell.value, str):
                     for key, value in data.items():
-                        placeholder = f"{{{{{key}}}}}"
-                        if placeholder in cell.value:
-                            cell.value = cell.value.replace(placeholder, str(value))
-                            fields_filled.append(key)
-        
+                        placeholders = [
+                            f"{{{{{key}}}}}",
+                            f"{{{key}}}",
+                            key
+                        ]
+                        
+                        for placeholder in placeholders:
+                            if placeholder in cell.value:
+                                cell.value = cell.value.replace(placeholder, str(value))
+                                if key not in fields_filled:
+                                    fields_filled.append(key)
+        
+        # Ensure output directory exists
+        Path(output_path).parent.mkdir(parents=True, exist_ok=True)
         wb.save(output_path)
         
         return {
@@ -107,10 +138,19 @@ async def fill_text_form(template_path: str, data: Dict[str, Any], output_path:
         
         fields_filled = []
         for key, value in data.items():
-            placeholder = f"{{{{{key}}}}}"
-            if placeholder in content:
-                content = content.replace(placeholder, str(value))
-                fields_filled.append(key)
+            placeholders = [
+                f"{{{{{key}}}}}",
+                f"{{{key}}}",
+            ]
+            
+            for placeholder in placeholders:
+                if placeholder in content:
+                    content = content.replace(placeholder, str(value))
+                    if key not in fields_filled:
+                        fields_filled.append(key)
+        
+        # Ensure output directory exists
+        Path(output_path).parent.mkdir(parents=True, exist_ok=True)
         
         with open(output_path, 'w', encoding='utf-8') as f:
             f.write(content)
@@ -137,7 +177,9 @@ async def generate_form_template(fields: list) -> dict:
             p.add_run(f"{field}: ").bold = True
             p.add_run(f"{{{{{field}}}}}")
         
+        # Ensure output directory exists
         output_path = "data/outputs/form_template.docx"
+        Path(output_path).parent.mkdir(parents=True, exist_ok=True)
         doc.save(output_path)
         
         return {