Update app.py

app.py

@@ -10,7 +10,6 @@ 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...")
@@ -25,11 +24,9 @@ formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
 console_handler.setFormatter(formatter)
 logger.addHandler(console_handler)
 
-# Check Python version and dependencies
-logging.info(f"Python version: {sys.version}")
+# Attempt to import Salesforce library with fallback
 try:
-    import simple_salesforce
-    logging.info("simple-salesforce module imported successfully")
+    from simple_salesforce import Salesforce, SalesforceError
     SALESFORCE_AVAILABLE = True
 except ImportError as e:
     logging.error(f"Failed to import simple-salesforce: {str(e)}. Salesforce functionality will be disabled.")
@@ -60,12 +57,7 @@ if not HF_API_TOKEN:
     HF_AVAILABLE = False
 else:
     HF_AVAILABLE = True
-    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
+    hf_client = InferenceClient(token=HF_API_TOKEN)
 
 # Initialize Salesforce connection with retry mechanism
 @retry(tries=3, delay=2, backoff=2, logger=logger)
@@ -78,7 +70,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 = simple_salesforce.Salesforce(
+        sf = Salesforce(
             username=SF_USERNAME,
             password=SF_PASSWORD,
             security_token=SF_SECURITY_TOKEN,
@@ -88,11 +80,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
+        # Test create access by attempting to describe the object and check permissions
         object_description = sf.Project_Closure_Handover__c.describe()
         logging.info(f"Object description: {object_description}")
         return sf, "Salesforce connected successfully"
-    except simple_salesforce.SalesforceError as e:
+    except SalesforceError as e:
         logging.error(f"Salesforce authentication failed: {str(e)}")
         logging.error("Possible issues: Incorrect credentials, IP restrictions, or insufficient permissions.")
         raise
@@ -101,26 +93,6 @@ def init_salesforce():
         logging.error("Check your Salesforce org settings, network restrictions, or API access.")
         raise
 
-# Function to query a valid Project ID from the related object (assumed to be Project__c)
-def get_project_id(sf):
-    try:
-        # Query the most recent active project (modify the WHERE clause as needed)
-        project_query = sf.query("SELECT Id FROM Project__c WHERE IsActive__c = true ORDER BY CreatedDate DESC LIMIT 1")
-        if project_query['records']:
-            project_id = project_query['records'][0]['Id']
-            logging.info(f"Found Project ID: {project_id}")
-            return project_id
-        else:
-            logging.warning("No active Project__c records found. Omitting Project_ID__c.")
-            return None
-    except simple_salesforce.SalesforceError as e:
-        logging.error(f"Error querying Project__c: {str(e)}")
-        logging.error("Possible issues: Object does not exist, insufficient permissions, or incorrect field name.")
-        return None
-    except Exception as e:
-        logging.error(f"Unexpected error while querying Project ID: {str(e)}")
-        return None
-
 # Summarize text using Hugging Face Inference API
 def summarize_text(text, max_length=100, min_length=30):
     if not HF_AVAILABLE:
@@ -145,7 +117,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. Ensure 'simple-salesforce' is installed."
+        return "Salesforce library not available"
 
     try:
         sf, connection_message = init_salesforce()
@@ -157,9 +129,6 @@ def create_salesforce_record(score, checklist_summary, missing_summary, status,
         summarized_checklist = summarize_text(checklist_summary)
         summarized_missing = summarize_text(missing_summary)
 
-        # Query a valid Project ID for the Lookup field
-        project_id = get_project_id(sf)
-
         # Ensure inputs are properly formatted
         score = float(score) if score is not None else 0.0
         checklist_summary = str(checklist_summary) if checklist_summary else ""
@@ -195,10 +164,6 @@ def create_salesforce_record(score, checklist_summary, missing_summary, status,
             "QA_Report__c": qa_report
         }
 
-        # Include Project_ID__c only if a valid ID was found
-        if project_id:
-            record["Project_ID__c"] = project_id
-
         logging.debug(f"Attempting to create Salesforce record in Project_Closure_Handover__c with data: {record}")
         result = sf.Project_Closure_Handover__c.create(record)
         logging.info(f"Successfully created Salesforce record: {result}")
@@ -238,15 +203,14 @@ def create_salesforce_record(score, checklist_summary, missing_summary, status,
         else:
             logging.warning(f"No PDF file found at {pdf_path}. Skipping attachment and URL update.")
 
-        project_id_message = f"Project ID: {project_id}" if project_id else "Project ID: Not set (no active Project__c records found)"
-        return f"Record created successfully. Record ID: {record_id}. PDF attached and URL set to: {pdf_download_url}. {project_id_message}"
-    except simple_salesforce.SalesforceError as e:
+        return f"Record created successfully. Record ID: {record_id}. PDF attached and URL set to: {pdf_download_url}"
+    except 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:")
         logging.error("- Ensure the user has Create and Edit permission on Project_Closure_Handover__c.")
         logging.error("- Ensure the user has permission to create and read Attachments.")
-        logging.error("- Verify field-level security for all fields in the record, including Project_ID__c.")
+        logging.error("- Verify field-level security for all fields in the record.")
         logging.error("- Check for validation rules or required fields that might be failing.")
         return f"Salesforce error: {str(e)}"
     except Exception as e:
@@ -408,7 +372,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)}")
-        return None, f"Error generating PDF: {str(e)}"
+        raise
 
 # Gradio interface with updated UI
 with gr.Blocks(css="""
@@ -421,7 +385,7 @@ with gr.Blocks(css="""
     gr.Markdown(
         """
         # Project Closure Readiness Evaluator
-        Evaluate project readiness, generate a PDF report with signature slots, and save to Salesforce.
+        Evaluate project readiness, generate a PDF report with signature slots.
         """
     )
     with gr.Row():
@@ -439,7 +403,7 @@ with gr.Blocks(css="""
                 value="Open Items",
                 allow_custom_value=False
             )
-            submit_btn = gr.Button("Evaluate, Generate PDF, and Save to Salesforce")
+            submit_btn = gr.Button("Evaluate and Generate PDF")
         with gr.Column(scale=3):
             score_output = gr.Number(label="Readiness Score (%)")
             progress_output = gr.HTML(label="Alert Indicator: Progress")
@@ -452,45 +416,25 @@ with gr.Blocks(css="""
             open_punch_items_output = gr.Number(label="Open Punch Items (Debug)")
             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=handle_submission,
+        fn=evaluate_readiness,
         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,
-            pdf_output, pdf_debug, salesforce_output, error_output
+            gr.State(), gr.State(), gr.State(), gr.State(), open_punch_items_output, status_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_output, status_output,
+            gr.State(), gr.State(), gr.State(), gr.State(), open_punch_items_output, pdf_output
+        ],
+        outputs=None
     )
-
-if __name__ == "__main__":
-    try:
-        demo.launch()
-    except Exception as e:
-        logging.error(f"Failed to launch Gradio app: {str(e)}")
-        raise
+    demo.launch()