Update app.py

app.py

@@ -1,5 +1,5 @@
 import gradio as gr
-from simple_salesforce import Salesforce
+from simple_salesforce import Salesforce, SalesforceResourceNotFound
 from dotenv import load_dotenv
 import os
 import logging
@@ -8,14 +8,14 @@ import logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
 
-# Load environment variables
+# Load environment variables from .env file (for local development)
 load_dotenv()
 
 # Salesforce credentials
 SF_USERNAME = os.getenv("SF_USERNAME")
 SF_PASSWORD = os.getenv("SF_PASSWORD")
 SF_SECURITY_TOKEN = os.getenv("SF_SECURITY_TOKEN")
-SF_INSTANCE_URL = os.getenv("SF_INSTANCE_URL", "https://login.salesforce.com")
+SF_INSTANCE_URL = os.getenv("SF_INSTANCE_URL", "https://login.salesforce.com")  # Default to production
 
 # Initialize Salesforce client
 sf = None
@@ -29,14 +29,71 @@ try:
         )
         logger.info("Successfully connected to Salesforce")
     else:
-        logger.error("Salesforce credentials not found")
+        logger.error("Salesforce credentials not found in environment variables")
 except Exception as e:
     logger.error(f"Failed to connect to Salesforce: {str(e)}")
 
+def verify_salesforce_object():
+    """Verify if Project_Closure_Handover__c exists and contains data."""
+    if sf is None:
+        logger.error("Salesforce client not initialized")
+        return "Salesforce connection not established. Check credentials in Hugging Face Secrets or .env file."
+    
+    try:
+        # Check if the object exists
+        sf.Project_Closure_Handover__c.describe()
+        logger.info("Object Project_Closure_Handover__c exists")
+        
+        # Check if the object has data
+        query = "SELECT Id FROM Project_Closure_Handover__c LIMIT 1"
+        result = sf.query(query)
+        has_data = result["totalSize"] > 0
+        data_status = "contains data" if has_data else "is empty"
+        logger.info(f"Object Project_Closure_Handover__c {data_status}")
+        
+        return f"Object Project_Closure_Handover__c exists and {data_status}."
+    except SalesforceResourceNotFound:
+        logger.error("Object Project_Closure_Handover__c does not exist")
+        return "Object Project_Closure_Handover__c does not exist in Salesforce."
+    except Exception as e:
+        logger.error(f"Error verifying object: {str(e)}")
+        return f"Error verifying object: {str(e)}"
+
+def fetch_salesforce_data(project_id):
+    """Fetch project data from Salesforce using the project ID."""
+    if not project_id:
+        return "Project ID is required for Salesforce data retrieval.", None, None, None, None
+    
+    if sf is None:
+        logger.error("Salesforce client not initialized")
+        return "Salesforce connection not established. Check credentials in Hugging Face Secrets or .env file.", None, None, None, None
+    
+    try:
+        # Query the Project_Closure_Handover__c object
+        query = f"SELECT Project_Logs__c, QA_Report__c, Punch_List__c FROM Project_Closure_Handover__c WHERE Id = '{project_id}'"
+        logger.info(f"Executing Salesforce query: {query}")
+        result = sf.query(query)
+        
+        if result["totalSize"] > 0:
+            record = result["records"][0]
+            logs = record.get("Project_Logs__c", "") or ""  # Fixed field name from Project_ID__c to Project_Logs__c
+            qa_report = record.get("QA_Report__c", "") or ""
+            punch_list = record.get("Punch_List__c", "") or ""
+            logger.info(f"Fetched data for Project ID {project_id}: Logs={logs}, QA={qa_report}, Punch={punch_list}")
+            return None, logs, qa_report, punch_list, f"Raw Salesforce Data: Logs='{logs}', QA='{qa_report}', Punch='{punch_list}'"
+        else:
+            logger.warning(f"No record found for Project ID: {project_id}")
+            return "No record found for the provided Project ID.", None, None, None, None
+    except Exception as e:
+        logger.error(f"Error fetching Salesforce data: {str(e)}")
+        return f"Error fetching Salesforce data: {str(e)}", None, None, None, None
+
 def create_salesforce_record(project_logs, qa_report, punch_list):
     """Create a new record in Salesforce."""
     if sf is None:
-        return "Salesforce connection not established."
+        logger.error("Salesforce client not initialized")
+        return "Salesforce connection not established. Check credentials in Hugging Face Secrets or .env file."
+    
     try:
         data = {
             "Project_Logs__c": project_logs,
@@ -44,29 +101,119 @@ def create_salesforce_record(project_logs, qa_report, punch_list):
             "Punch_List__c": punch_list
         }
         result = sf.Project_Closure_Handover__c.create(data)
+        logger.info(f"Created record with ID: {result['id']}")
         return f"Successfully created record with ID: {result['id']}"
     except Exception as e:
+        logger.error(f"Error creating record: {str(e)}")
         return f"Error creating record: {str(e)}"
 
-# Gradio interface
+def evaluate_readiness(logs, qa_report, punch_list_text):
+    """Evaluate project closure readiness based on input data."""
+    score = 60  # Base score
+    missing_items = []
+
+    # Log input values for debugging
+    logger.info(f"Evaluating readiness: Logs='{logs}', QA='{qa_report}', Punch='{punch_list_text}'")
+
+    # Process Project Logs
+    if logs and ("complete" in logs.lower() or "handover done" in logs.lower()):
+        score += 10
+        logger.info("Project Logs valid: Added +10 to score")
+    else:
+        missing_items.append("Project Logs Incomplete (requires 'complete' or 'handover done')")
+        logger.warning("Project Logs invalid or empty")
+
+    # Process QA Report
+    if qa_report and qa_report.strip().lower() in ["approved", "passed"]:
+        score += 20
+        logger.info("QA Report valid: Added +20 to score")
+    else:
+        missing_items.append("QA Approval Missing (requires 'approved' or 'passed')")
+        logger.warning("QA Report invalid or empty")
+
+    # Process Punch List
+    if punch_list_text and ("none" in punch_list_text.lower() or "resolved" in punch_list_text.lower()):
+        score += 10
+        logger.info("Punch List valid: Added +10 to score")
+    else:
+        missing_items.append("Open Punch Points Detected (requires 'none' or 'resolved')")
+        logger.warning("Punch List invalid or empty")
+
+    # Build output summary
+    checklist_summary = "All checklist items reviewed." if not missing_items else "Pending: " + ", ".join(missing_items)
+    missing_summary = "None" if not missing_items else ", ".join(missing_items)
+
+    logger.info(f"Readiness evaluation completed. Score: {score}, Missing: {missing_summary}")
+    return score, checklist_summary, missing_summary
+
+def combined_workflow(project_id, logs, qa_report, punch_list_text):
+    """Combine Salesforce data fetching, record creation, and readiness evaluation."""
+    error = None
+    raw_data = None
+    create_status = None
+    
+    # Create record if inputs are provided
+    if logs and qa_report and punch_list_text:
+        create_status = create_salesforce_record(logs, qa_report, punch_list_text)
+    else:
+        create_status = "Record not created: All inputs (Project Logs, QA Report, Punch List) are required."
+        logger.warning(create_status)
+    
+    # Fetch data if project_id is provided
+    if project_id:
+        logger.info(f"Fetching Salesforce data for Project ID: {project_id}")
+        error, sf_logs, sf_qa, sf_punch, raw_data = fetch_salesforce_data(project_id)
+        if error:
+            logger.warning(f"Salesforce fetch failed, using manual inputs: {error}")
+        else:
+            # Use Salesforce data if available, otherwise fall back to manual inputs
+            logs = sf_logs if sf_logs is not None else logs
+            qa_report = sf_qa if sf_qa is not None else qa_report
+            punch_list_text = sf_punch if sf_punch is not None else punch_list_text
+    
+    if not (logs and qa_report and punch_list_text):
+        error_msg = "Please provide all inputs manually or a valid Salesforce Project ID."
+        logger.error(error_msg)
+        return error_msg if not error else f"{error} {error_msg}", None, None, None, raw_data, create_status
+    
+    score, checklist_summary, missing_summary = evaluate_readiness(logs, qa_report, punch_list_text)
+    return error, score, checklist_summary, missing_summary, raw_data, create_status
+
+# Gradio interface setup
 with gr.Blocks() as demo:
     gr.Markdown("# Project Closure Readiness Evaluator")
     
-    # Input section
+    # Object verification section
+    gr.Markdown("## Verify Salesforce Object")
+    verify_button = gr.Button("Check Project_Closure_Handover__c")
+    verify_output = gr.Textbox(label="Object Status", interactive=False)
+    
+    # Data input section
     gr.Markdown("## Enter Project Details")
-    logs = gr.Textbox(label="Project Logs", placeholder="e.g., Project complete")
+    gr.Markdown("Enter a Salesforce Project ID to fetch data or provide inputs manually. Inputs will be used to create a new Salesforce record.")
+    project_id = gr.Textbox(label="Salesforce Project ID (Optional)", placeholder="e.g., a0Axxxxxxxxxxxx")
+    logs = gr.Textbox(label="Project Logs", placeholder="e.g., Project complete, handover done")
     qa_report = gr.Textbox(label="QA Report", placeholder="e.g., Approved")
-    punch_list = gr.Textbox(label="Punch List", placeholder="e.g., None")
+    punch_list = gr.Textbox(label="Punch List (Plain Text)", placeholder="e.g., None or Resolved")
+    
+    # Submit button
+    submit_button = gr.Button("Evaluate Readiness and Create Record")
     
-    # Create button
-    create_button = gr.Button("Create Salesforce Record")
-    create_output = gr.Textbox(label="Record Creation Status", interactive=False)
+    # Output section
+    gr.Markdown("## Results")
+    error_output = gr.Textbox(label="Error (if any)", interactive=False)
+    score_output = gr.Number(label="Readiness Score (%)", interactive=False)
+    checklist_output = gr.Textbox(label="Checklist Summary", interactive=False)
+    missing_output = gr.Textbox(label="Missing Items", interactive=False)
+    raw_data_output = gr.Textbox(label="Raw Salesforce Data (if fetched)", interactive=False)
+    create_status_output = gr.Textbox(label="Record Creation Status", interactive=False)
     
-    # Bind create function
-    create_button.click(
-        create_salesforce_record,
-        inputs=[logs, qa_report, punch_list],
-        outputs=create_output
+    # Event handlers
+    verify_button.click(verify_salesforce_object, outputs=verify_output)
+    submit_button.click(
+        combined_workflow,
+        inputs=[project_id, logs, qa_report, punch_list],
+        outputs=[error_output, score_output, checklist_output, missing_output, raw_data_output, create_status_output]
     )
 
 demo.launch()