Update app.py

app.py

@@ -10,6 +10,7 @@ from retry import retry
 import time
 from datetime import datetime
 import base64
+import sys
 
 # Print statement to confirm script initialization
 print("Starting Project Closure Readiness Evaluator app...")
@@ -24,9 +25,11 @@ formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
 console_handler.setFormatter(formatter)
 logger.addHandler(console_handler)
 
-# Attempt to import Salesforce library with fallback
+# Check Python version and dependencies
+logging.info(f"Python version: {sys.version}")
 try:
-    from simple_salesforce import Salesforce, SalesforceError
+    import simple_salesforce
+    logging.info(f"simple-salesforce version: {simple_salesforce.__version__}")
     SALESFORCE_AVAILABLE = True
 except ImportError as e:
     logging.error(f"Failed to import simple-salesforce: {str(e)}. Salesforce functionality will be disabled.")
@@ -57,7 +60,12 @@ if not HF_API_TOKEN:
     HF_AVAILABLE = False
 else:
     HF_AVAILABLE = True
-    hf_client = InferenceClient(token=HF_API_TOKEN)
+    try:
+        hf_client = InferenceClient(token=HF_API_TOKEN)
+        logging.info("Hugging Face InferenceClient initialized successfully")
+    except Exception as e:
+        logging.error(f"Failed to initialize Hugging Face InferenceClient: {str(e)}")
+        HF_AVAILABLE = False
 
 # Initialize Salesforce connection with retry mechanism
 @retry(tries=3, delay=2, backoff=2, logger=logger)
@@ -70,7 +78,7 @@ def init_salesforce():
         logging.info("Attempting to connect to Salesforce with the following credentials:")
         logging.info(f"Username: {SF_USERNAME}")
         logging.info(f"Instance URL: {SF_INSTANCE_URL}")
-        sf = Salesforce(
+        sf = simple_salesforce.Salesforce(
             username=SF_USERNAME,
             password=SF_PASSWORD,
             security_token=SF_SECURITY_TOKEN,
@@ -80,11 +88,11 @@ def init_salesforce():
         # Test read access on Project_Closure_Handover__c
         test_query = sf.query("SELECT Id FROM Project_Closure_Handover__c LIMIT 1")
         logging.info(f"Test query result (read access): {test_query}")
-        # Test create access by attempting to describe the object and check permissions
+        # Test create access by attempting to describe the object
         object_description = sf.Project_Closure_Handover__c.describe()
         logging.info(f"Object description: {object_description}")
         return sf, "Salesforce connected successfully"
-    except SalesforceError as e:
+    except simple_salesforce.SalesforceError as e:
         logging.error(f"Salesforce authentication failed: {str(e)}")
         logging.error("Possible issues: Incorrect credentials, IP restrictions, or insufficient permissions.")
         raise
@@ -117,7 +125,7 @@ def summarize_text(text, max_length=100, min_length=30):
 def create_salesforce_record(score, checklist_summary, missing_summary, status, escalated, logs, qa_report, punch_list_text, open_punch_items, pdf_path=None):
     if not SALESFORCE_AVAILABLE:
         logging.error("Salesforce library not available. Skipping record creation.")
-        return "Salesforce library not available"
+        return "Salesforce library not available. Ensure 'simple-salesforce' is installed."
 
     try:
         sf, connection_message = init_salesforce()
@@ -209,7 +217,7 @@ def create_salesforce_record(score, checklist_summary, missing_summary, status,
             logging.warning(f"No PDF file found at {pdf_path}. Skipping attachment and URL update.")
 
         return f"Record created successfully. Record ID: {record_id}. PDF attached and URL set to: {pdf_download_url}. Project ID: {project_id}"
-    except SalesforceError as e:
+    except simple_salesforce.SalesforceError as e:
         logging.error(f"Salesforce error while creating Project_Closure_Handover__c record: {str(e)}")
         logging.error("Possible issues: Object permissions, field-level security, validation rules, or required fields.")
         logging.error("Check the following in your Salesforce org:")
@@ -377,7 +385,7 @@ def generate_pdf(score, checklist_summary, missing_summary, checklist_status, lo
         return pdf_path, "PDF generation completed. Click the link to download."
     except Exception as e:
         logging.error(f"Error in generate_pdf: {str(e)}")
-        raise
+        return None, f"Error generating PDF: {str(e)}"
 
 # Gradio interface with updated UI
 with gr.Blocks(css="""
@@ -422,25 +430,41 @@ with gr.Blocks(css="""
             pdf_output = gr.File(label="Download PDF Report", type="filepath", interactive=False)
             pdf_debug = gr.Textbox(label="PDF Debug Output")
             salesforce_output = gr.Textbox(label="Salesforce Save Status")
+            error_output = gr.Textbox(label="Error Details (if any)")
 
     # Chain the evaluation, PDF generation, and Salesforce record creation
+    def handle_submission(logs, qa_report, punch_list_text):
+        try:
+            # Evaluate readiness
+            result = evaluate_readiness(logs, qa_report, punch_list_text)
+            score, checklist_summary, missing_summary, status, progress_bar, escalated, logs, qa_report, punch_list_text, open_punch_items, checklist_status = result
+            
+            # Generate PDF
+            pdf_path, pdf_message = generate_pdf(score, checklist_summary, missing_summary, checklist_status, logs, qa_report, punch_list_text)
+            
+            # Save to Salesforce
+            salesforce_message = create_salesforce_record(
+                score, checklist_summary, missing_summary, status, escalated, logs, qa_report, punch_list_text, open_punch_items, pdf_path
+            )
+            
+            return [
+                score, checklist_summary, missing_summary, status, progress_bar, escalated, logs, qa_report, punch_list_text, open_punch_items, checklist_status,
+                pdf_path, pdf_message, salesforce_message, ""
+            ]
+        except Exception as e:
+            logging.error(f"Submission error: {str(e)}")
+            return [None, None, None, None, None, None, None, None, None, None, None, None, None, f"Error: {str(e)}"]
+
     submit_btn.click(
-        fn=evaluate_readiness,
+        fn=handle_submission,
         inputs=[logs_input, qa_input, punch_input],
         outputs=[
             score_output, checklist_output, missing_output, status_output, progress_output,
-            gr.State(), gr.State(), gr.State(), gr.State(), open_punch_items_output, status_output
+            gr.State(), gr.State(), gr.State(), gr.State(), open_punch_items_output, status_output,
+            pdf_output, pdf_debug, salesforce_output, error_output
         ]
-    ).then(
-        fn=generate_pdf,
-        inputs=[score_output, checklist_output, missing_output, status_output, gr.State(), gr.State(), gr.State()],
-        outputs=[pdf_output, pdf_debug]
-    ).then(
-        fn=create_salesforce_record,
-        inputs=[
-            score_output, checklist_output, missing_summary, status_output,
-            gr.State(), gr.State(), gr.State(), gr.State(), open_punch_items_output, pdf_output
-        ],
-        outputs=[salesforce_output]
     )
-    demo.launch()
+
+if __name__ == "__main__":
+    try:
+        demo.launch()