Upload app.py

app.py

@@ -71,26 +71,30 @@ def convert_docx_to_pdf(docx_path):
     """Convert Word document to PDF using LibreOffice or system tools"""
     try:
         output_pdf = docx_path.replace('.docx', '.pdf')
+        print(f"📄 Converting {os.path.basename(docx_path)} to PDF...")
         
         # Try LibreOffice conversion (works on Linux/HuggingFace)
         if platform.system() != 'Windows':
             try:
+                print("🐧 Using LibreOffice (Linux)...")
                 result = subprocess.run([
                     'libreoffice', '--headless', '--convert-to', 'pdf',
                     '--outdir', os.path.dirname(docx_path), docx_path
                 ], check=True, capture_output=True, timeout=30)
                 
                 if os.path.exists(output_pdf):
+                    print(f"✅ PDF created: {os.path.basename(output_pdf)}")
                     return output_pdf
                 else:
-                    print(f"LibreOffice: PDF not created, using DOCX")
+                    print(f"⚠️ LibreOffice: PDF not created, using DOCX")
                     return docx_path
             except (subprocess.CalledProcessError, FileNotFoundError, subprocess.TimeoutExpired) as e:
-                print(f"LibreOffice not available or failed: {e}. Using DOCX file.")
+                print(f"⚠️ LibreOffice not available or failed: {e}. Using DOCX file.")
                 return docx_path
         else:
             # For Windows, try using win32com with proper error handling
             try:
+                print("🪟 Using win32com (Windows)...")
                 import win32com.client
                 import pythoncom
                 import time
@@ -103,10 +107,14 @@ def convert_docx_to_pdf(docx_path):
                     word.DisplayAlerts = 0
                     
                     # Open document
-                    doc = word.Documents.Open(os.path.abspath(docx_path))
+                    abs_docx = os.path.abspath(docx_path)
+                    abs_pdf = os.path.abspath(output_pdf)
+                    print(f"Opening: {abs_docx}")
+                    doc = word.Documents.Open(abs_docx)
                     
                     # Save as PDF (wdFormatPDF = 17)
-                    doc.SaveAs2(os.path.abspath(output_pdf), FileFormat=17)
+                    print(f"Saving as: {abs_pdf}")
+                    doc.SaveAs2(abs_pdf, FileFormat=17)
                     
                     # Close document
                     doc.Close(SaveChanges=False)
@@ -116,9 +124,10 @@ def convert_docx_to_pdf(docx_path):
                     
                     # Check if PDF was created
                     if os.path.exists(output_pdf):
+                        print(f"✅ PDF created: {os.path.basename(output_pdf)}")
                         return output_pdf
                     else:
-                        print(f"PDF not created: {output_pdf}")
+                        print(f"❌ PDF not created: {output_pdf}")
                         return docx_path
                         
                 finally:
@@ -126,12 +135,15 @@ def convert_docx_to_pdf(docx_path):
                         word.Quit()
                     pythoncom.CoUninitialize()
                     
+            except ImportError as ie:
+                print(f"⚠️ win32com not installed: {ie}. Returning DOCX file.")
+                return docx_path
             except Exception as e:
-                print(f"Win32com PDF conversion error: {e}")
+                print(f"❌ Win32com PDF conversion error: {e}")
                 # If conversion fails, return docx path
                 return docx_path
     except Exception as e:
-        print(f"PDF conversion error: {e}")
+        print(f"❌ PDF conversion error: {e}")
         return docx_path
 
 def replace_text_in_docx(docx_path, placeholder, replacement):
@@ -345,7 +357,7 @@ def process_certificates(template_file, csv_file, send_emails, placeholder_text,
     try:
         # Validate email config if sending emails
         if send_emails:
-            if not all(email_config.values()):
+            if not all([email_config.get('smtp_server'), email_config.get('sender_email'), email_config.get('sender_password')]):
                 return "❌ Please configure email server settings first!", None
         
         # Update placeholder text
@@ -371,71 +383,86 @@ def process_certificates(template_file, csv_file, send_emails, placeholder_text,
         successful = 0
         failed = 0
         generated_files = []
-        cert_data = []  # Store (cert_file, name, email) tuples
         
-        # Phase 1: Generate all certificates in parallel
-        cert_tasks = []
+        # Phase 1: Generate all certificates in parallel with progress
+        cert_futures = {}
         
         with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
-            # Submit all certificate generation tasks
+            # Submit all tasks
             for idx, row in df.iterrows():
                 name = row['Name']
                 email = row.get('Email address', '')
                 future = executor.submit(generate_single_certificate, template_path, name, placeholder_text)
-                cert_tasks.append((future, name, email))
+                cert_futures[future] = (name, email)
             
-            # Collect results as they complete
-            completed = 0
-            for future, name, email in cert_tasks:
+            # Process completed futures with progress
+            completed_count = 0
+            for future in as_completed(cert_futures):
+                name, email = cert_futures[future]
+                completed_count += 1
+                
                 try:
-                    cert_file, error = future.result(timeout=60)
-                    completed += 1
+                    cert_file, error = future.result()
                     
-                    if cert_file:
-                        generated_files.append(cert_file)
-                        cert_data.append((cert_file, name, email))
+                    if cert_file and os.path.exists(cert_file):
+                        generated_files.append((cert_file, name, email))
                         if not send_emails:
                             successful += 1
                             results.append(f"✅ {name}")
                     else:
                         failed += 1
-                        results.append(f"❌ {name}: {error}")
+                        results.append(f"❌ {name}: {error if error else 'Generation failed'}")
+                        
                 except Exception as e:
-                    completed += 1
                     failed += 1
                     results.append(f"❌ {name}: {str(e)}")
+                
+                # Update progress
+                progress(completed_count / total, desc=f"📄 Generated {completed_count}/{total} certificates")
         
-        # Phase 2: Send emails sequentially with rate limiting (if requested)
-        if send_emails and cert_data:
+        # Phase 2: Send emails sequentially with rate limiting and progress
+        if send_emails and generated_files:
             email_successful = 0
             email_failed = 0
-            email_total = len(cert_data)
+            email_total = len(generated_files)
             
-            for idx, (cert_file, name, email) in enumerate(cert_data):
-                if cert_file and os.path.exists(cert_file):
+            for idx, (cert_file, name, email) in enumerate(generated_files):
+                try:
                     success, error = send_email_with_retry(email, name, cert_file)
                     
                     if success:
                         email_successful += 1
-                        # Update result
-                        for i, res in enumerate(results):
-                            if name in res:
+                        # Update existing result
+                        for i in range(len(results)):
+                            if name in results[i]:
                                 results[i] = f"✅ {name} ({email})"
                                 break
                     else:
                         email_failed += 1
-                        # Update result
-                        for i, res in enumerate(results):
-                            if name in res:
+                        # Update existing result
+                        for i in range(len(results)):
+                            if name in results[i]:
                                 results[i] = f"❌ {name} ({email}): {error}"
                                 break
+                    
+                    # Update progress (fix division to show correct percentage)
+                    progress((idx + 1) / email_total, desc=f"📧 Sent {idx + 1}/{email_total} emails")
+                    
+                except Exception as e:
+                    email_failed += 1
+                    for i in range(len(results)):
+                        if name in results[i]:
+                            results[i] = f"❌ {name} ({email}): {str(e)}"
+                            break
             
             successful = email_successful
             failed = email_failed
         
         # Create ZIP file with all certificates
         zip_path = None
-        if generated_files:
+        all_cert_files = [cert_file for cert_file, _, _ in generated_files] if generated_files else []
+        
+        if all_cert_files:
             try:
                 # Create a temporary directory for the ZIP
                 zip_dir = tempfile.mkdtemp()
@@ -445,7 +472,7 @@ def process_certificates(template_file, csv_file, send_emails, placeholder_text,
                 
                 # Create ZIP file
                 with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
-                    for cert_file in generated_files:
+                    for cert_file in all_cert_files:
                         if os.path.exists(cert_file):
                             # Add file to ZIP with just the filename (not full path)
                             zipf.write(cert_file, os.path.basename(cert_file))