Update app.py

app.py

@@ -8,7 +8,11 @@ import logging
 from datetime import datetime
 from fastapi.responses import HTMLResponse
 from simple_salesforce import Salesforce
-import json
+import requests
+from dotenv import load_dotenv
+
+# Load environment variables
+load_dotenv()
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
@@ -21,6 +25,8 @@ SF_USERNAME = os.getenv("SF_USERNAME")
 SF_PASSWORD = os.getenv("SF_PASSWORD")
 SF_SECURITY_TOKEN = os.getenv("SF_SECURITY_TOKEN")
 SF_DOMAIN = os.getenv("SF_DOMAIN", "login")
+HUGGINGFACE_API_KEY = os.getenv("HUGGINGFACE_API_KEY")
+HUGGINGFACE_API_URL = os.getenv("HUGGINGFACE_API_URL")
 
 # Validate environment variables
 required_env_vars = ["SF_USERNAME", "SF_PASSWORD", "SF_SECURITY_TOKEN"]
@@ -29,6 +35,13 @@ for var in required_env_vars:
         logger.error(f"Environment variable {var} is not set")
         raise ValueError(f"Environment variable {var} is not set")
 
+# Optional Hugging Face validation
+USE_HUGGINGFACE = HUGGINGFACE_API_KEY and HUGGINGFACE_API_URL
+if USE_HUGGINGFACE:
+    logger.info("Hugging Face integration enabled")
+else:
+    logger.info("Hugging Face integration disabled; using local scoring")
+
 # Connect to Salesforce
 try:
     sf = Salesforce(
@@ -59,6 +72,41 @@ class VendorLog(BaseModel):
 # Store vendor logs for display
 vendor_logs = []
 
+def validate_salesforce_fields():
+    """Verify required fields exist in Salesforce"""
+    try:
+        # Check Vendor_Log__c fields
+        vendor_log_desc = sf.Vendor_Log__c.describe()
+        required_fields = [
+            'Vendor__c', 'Work_Completion_Percentage__c', 'Quality_Percentage__c',
+            'Incident_Severity__c', 'Work_Completion_Date__c', 'Actual_Completion_Date__c',
+            'Delay_Days__c', 'Project__c'
+        ]
+        available_fields = [field['name'] for field in vendor_log_desc['fields']]
+        for field in required_fields:
+            if field not in available_fields:
+                logger.error(f"Field {field} not found in Vendor_Log__c")
+                raise ValueError(f"Field {field} not found in Vendor_Log__c")
+
+        # Check Subcontractor_Performance_Score__c fields
+        score_desc = sf.Subcontractor_Performance_Score__c.describe()
+        required_score_fields = [
+            'Vendor__c', 'Month__c', 'Quality_Score__c', 'Timeliness_Score__c',
+            'Safety_Score__c', 'Communication_Score__c', 'Alert_Flag__c', 'Certification_URL__c'
+        ]
+        available_score_fields = [field['name'] for field in score_desc['fields']]
+        for field in required_score_fields:
+            if field not in available_score_fields:
+                logger.error(f"Field {field} not found in Subcontractor_Performance_Score__c")
+                raise ValueError(f"Field {field} not found in Subcontractor_Performance_Score__c")
+        logger.info("All required Salesforce fields validated successfully")
+    except Exception as e:
+        logger.error(f"Error validating Salesforce fields: {str(e)}")
+        raise
+
+# Validate fields on startup
+validate_salesforce_fields()
+
 def fetch_vendor_logs_from_salesforce():
     try:
         query = """
@@ -66,13 +114,11 @@ def fetch_vendor_logs_from_salesforce():
                Incident_Severity__c, Work_Completion_Date__c, Actual_Completion_Date__c, 
                Delay_Days__c, Project__c
         FROM Vendor_Log__c
+        WHERE Vendor__c != null
         """
         result = sf.query_all(query)
         logs = []
         for record in result['records']:
-            if not record['Vendor__c']:
-                logger.warning(f"Skipping Vendor_Log__c record with ID {record['Id']} due to missing Vendor__c")
-                continue
             log = VendorLog(
                 vendorLogId=record['Id'] or "Unknown",
                 vendorId=record['Name'] or "Unknown",
@@ -93,7 +139,7 @@ def fetch_vendor_logs_from_salesforce():
         logger.error(f"Error fetching vendor logs from Salesforce: {str(e)}")
         raise HTTPException(status_code=500, detail=f"Error fetching vendor logs: {str(e)}")
 
-def calculate_scores(log: VendorLog):
+def calculate_scores_local(log: VendorLog):
     try:
         work_completion_percentage = float(log.workDetails)
         quality_percentage = float(log.qualityReport)
@@ -118,9 +164,41 @@ def calculate_scores(log: VendorLog):
             'communicationScore': round(communication_score, 2)
         }
     except Exception as e:
-        logger.error(f"Error calculating scores: {str(e)}")
+        logger.error(f"Error calculating local scores: {str(e)}")
         raise HTTPException(status_code=500, detail=f"Error calculating scores: {str(e)}")
 
+def calculate_scores_huggingface(log: VendorLog):
+    try:
+        payload = {
+            'vendor_id': log.vendorId,
+            'delay_days': log.delayDays,
+            'work_completion_percentage': float(log.workDetails),
+            'quality_percentage': float(log.qualityReport),
+            'incident_severity': log.incidentLog,
+            'communication_frequency': 5  # Placeholder; adjust as needed
+        }
+        headers = {
+            'Authorization': f'Bearer {HUGGINGFACE_API_KEY}',
+            'Content-Type': 'application/json'
+        }
+        response = requests.post(HUGGINGFACE_API_URL, json=payload, headers=headers, timeout=30)
+        response.raise_for_status()
+        result = response.json()
+        return {
+            'qualityScore': round(result.get('quality_score', 0), 2),
+            'timelinessScore': round(result.get('timeliness_score', 0), 2),
+            'safetyScore': round(result.get('safety_score', 0), 2),
+            'communicationScore': round(result.get('communication_score', 0), 2)
+        }
+    except Exception as e:
+        logger.error(f"Error calculating Hugging Face scores: {str(e)}")
+        raise HTTPException(status_code=500, detail=f"Error with Hugging Face API: {str(e)}")
+
+def calculate_scores(log: VendorLog):
+    if USE_HUGGINGFACE:
+        return calculate_scores_huggingface(log)
+    return calculate_scores_local(log)
+
 def get_feedback(score: float, metric: str) -> str:
     try:
         if score >= 90:
@@ -151,7 +229,7 @@ def get_feedback(score: float, metric: str) -> str:
 
 def generate_pdf(vendor_id: str, vendor_log_name: str, scores: dict):
     try:
-        filename = f'report_{vendor_id}.pdf'
+        filename = f'report_{vendor_id}_{datetime.now().strftime("%Y%m%d%H%M%S")}.pdf'
         c = canvas.Canvas(filename, pagesize=letter)
         c.setFont('Helvetica', 12)
         c.drawString(100, 750, 'Subcontractor Performance Report')
@@ -222,7 +300,6 @@ def store_scores_in_salesforce(log: VendorLog, scores: dict, pdf_content: bytes,
         pdf_url = f"https://{sf.sf_instance}/sfc/servlet.shepherd/document/download/{content_document_id}"
 
         # Update Subcontractor_Performance_Score__c with PDF URL
-        # Note: Changed PDF_Link__c to Certification_URL__c to match your previous Salesforce schema
         sf.Subcontractor_Performance_Score__c.update(score_record_id, {
             'Certification_URL__c': pdf_url
         })
@@ -235,10 +312,6 @@ def store_scores_in_salesforce(log: VendorLog, scores: dict, pdf_content: bytes,
 async def score_vendor(log: VendorLog, authorization: str = Header(None)):
     try:
         logger.info(f"Received Vendor Log: {log}")
-        # Optional: Add API key check if needed
-        # if authorization != f'Bearer {API_KEY}':
-        #     raise HTTPException(status_code=401, detail='Invalid API key')
-
         scores = calculate_scores(log)
         pdf_content = generate_pdf(log.vendorId, log.vendorLogName, scores)
         pdf_base64 = base64.b64encode(pdf_content).decode('utf-8')
@@ -308,24 +381,21 @@ async def get_dashboard():
         <html>
             <head>
                 <title>Subcontractor Performance Score App</title>
+                <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
                 <style>
-                    body { font-family: Arial, sans-serif; margin: 20px; }
+                    body { font-family: Arial, sans-serif; margin: 20px; background-color: #f4f4f9; }
+                    .container { max-width: 1200px; }
                     table { width: 100%; border-collapse: collapse; margin-top: 20px; }
-                    th, td { border: 1px solid #ddd; padding: 8px; text-align: left; }
-                    th { background-color: #f2f2f2; }
-                    h1, h2 { text-align: center; }
+                    th, td { border: 1px solid #ddd; padding: 12px; text-align: left; }
+                    th { background-color: #007bff; color: white; }
+                    h1, h2 { text-align: center; color: #333; }
                     .generate-btn { 
-                        display: block; 
-                        margin: 20px auto; 
-                        padding: 10px 20px; 
-                        background-color: #4CAF50; 
-                        color: white; 
-                        border: none; 
-                        border-radius: 5px; 
-                        cursor: pointer; 
-                        font-size: 16px; 
+                        display: block; margin: 20px auto; padding: 10px 20px; 
+                        background-color: #4CAF50; color: white; border: none; 
+                        border-radius: 5px; cursor: pointer; font-size: 16px; 
                     }
                     .generate-btn:hover { background-color: #45a049; }
+                    .table-striped tbody tr:nth-of-type(odd) { background-color: #f9f9f9; }
                 </style>
                 <script>
                     async function generateScores() {
@@ -343,86 +413,96 @@ async def get_dashboard():
                 </script>
             </head>
             <body>
-                <h1>SUBCONTRACTOR PERFORMANCE SCORE APP GENERATOR</h1>
-                <h2>VENDOR LOGS SUBMISSION</h2>
-                <table>
-                    <tr>
-                        <th>Vendor ID</th>
-                        <th>Vendor Log Name</th>
-                        <th>Project</th>
-                        <th>Work Completion Percentage</th>
-                        <th>Quality Percentage</th>
-                        <th>Incident Severity</th>
-                        <th>Work Completion Date</th>
-                        <th>Actual Completion Date</th>
-                        <th>Delay Days</th>
-                    </tr>
+                <div class="container">
+                    <h1>SUBCONTRACTOR PERFORMANCE SCORE APP</h1>
+                    <h2>VENDOR LOGS SUBMISSION</h2>
+                    <table class="table table-striped">
+                        <thead>
+                            <tr>
+                                <th>Vendor ID</th>
+                                <th>Vendor Log Name</th>
+                                <th>Project</th>
+                                <th>Work Completion %</th>
+                                <th>Quality %</th>
+                                <th>Incident Severity</th>
+                                <th>Work Completion Date</th>
+                                <th>Actual Completion Date</th>
+                                <th>Delay Days</th>
+                            </tr>
+                        </thead>
+                        <tbody>
         """
 
         if not vendor_logs:
             html_content += """
-                    <tr>
-                        <td colspan="9" style="text-align: center;">No vendor logs available</td>
-                    </tr>
+                            <tr>
+                                <td colspan="9" style="text-align: center;">No vendor logs available</td>
+                            </tr>
             """
         else:
             for log in vendor_logs:
                 html_content += f"""
-                        <tr>
-                            <td>{log['vendorId']}</td>
-                            <td>{log['vendorLogName']}</td>
-                            <td>{log['project']}</td>
-                            <td>{log['workDetails']}</td>
-                            <td>{log['qualityReport']}</td>
-                            <td>{log['incidentLog']}</td>
-                            <td>{log['workCompletionDate']}</td>
-                            <td>{log['actualCompletionDate']}</td>
-                            <td>{log['delayDays']}</td>
-                        </tr>
+                            <tr>
+                                <td>{log['vendorId']}</td>
+                                <td>{log['vendorLogName']}</td>
+                                <td>{log['project']}</td>
+                                <td>{log['workDetails']}</td>
+                                <td>{log['qualityReport']}</td>
+                                <td>{log['incidentLog']}</td>
+                                <td>{log['workCompletionDate']}</td>
+                                <td>{log['actualCompletionDate']}</td>
+                                <td>{log['delayDays']}</td>
+                            </tr>
                 """
 
         html_content += """
-                </table>
-                <button class="generate-btn" onclick="generateScores()">Generate</button>
-                <h2>SUBCONTRACTOR PERFORMANCE SCORES</h2>
-                <table>
-                    <tr>
-                        <th>Vendor ID</th>
-                        <th>Vendor Log Name</th>
-                        <th>Project</th>
-                        <th>Quality Score</th>
-                        <th>Timeliness Score</th>
-                        <th>Safety Score</th>
-                        <th>Communication Score</th>
-                        <th>Alert Flag</th>
-                    </tr>
+                        </tbody>
+                    </table>
+                    <button class="generate-btn" onclick="generateScores()">Generate Scores</button>
+                    <h2>SUBCONTRACTOR PERFORMANCE SCORES</h2>
+                    <table class="table table-striped">
+                        <thead>
+                            <tr>
+                                <th>Vendor ID</th>
+                                <th>Vendor Log Name</th>
+                                <th>Project</th>
+                                <th>Quality Score</th>
+                                <th>Timeliness Score</th>
+                                <th>Safety Score</th>
+                                <th>Communication Score</th>
+                                <th>Alert Flag</th>
+                            </tr>
+                        </thead>
+                        <tbody>
         """
 
         if not vendor_logs:
             html_content += """
-                    <tr>
-                        <td colspan="8" style="text-align: center;">No scores available</td>
-                    </tr>
+                            <tr>
+                                <td colspan="8" style="text-align: center;">No scores available</td>
+                            </tr>
             """
         else:
             for log in vendor_logs:
                 scores = log['scores']
                 alert_flag = determine_alert_flag(scores, vendor_logs)
                 html_content += f"""
-                        <tr>
-                            <td>{log['vendorId']}</td>
-                            <td>{log['vendorLogName']}</td>
-                            <td>{log['project']}</td>
-                            <td>{scores['qualityScore']}%</td>
-                            <td>{scores['timelinessScore']}%</td>
-                            <td>{scores['safetyScore']}%</td>
-                            <td>{scores['communicationScore']}%</td>
-                            <td>{'Checked' if alert_flag else 'Unchecked'}</td>
-                        </tr>
+                            <tr>
+                                <td>{log['vendorId']}</td>
+                                <td>{log['vendorLogName']}</td>
+                                <td>{log['project']}</td>
+                                <td>{scores['qualityScore']}%</td>
+                                <td>{scores['timelinessScore']}%</td>
+                                <td>{scores['safetyScore']}%</td>
+                                <td>{scores['communicationScore']}%</td>
+                                <td>{'Checked' if alert_flag else 'Unchecked'}</td>
+                            </tr>
                 """
 
         html_content += """
-                </table>
+                        </tbody>
+                    </table>
+                </div>
             </body>
         </html>
         """
@@ -467,7 +547,25 @@ async def generate_scores():
         logger.error(f"Error in /generate endpoint: {str(e)}")
         raise HTTPException(status_code=500, detail=f"Error generating scores: {str(e)}")
 
+@app.get('/health')
+async def health_check():
+    try:
+        # Test Salesforce connection
+        result = sf.query("SELECT Id FROM Vendor_Log__c LIMIT 1")
+        return {
+            "status": "healthy",
+            "salesforce_connection": "success",
+            "vendor_log_count": result['totalSize'],
+            "huggingface_enabled": USE_HUGGINGFACE
+        }
+    except Exception as e:
+        logger.error(f"Health check failed: {str(e)}")
+        return {
+            "status": "unhealthy",
+            "salesforce_connection": f"failed: {str(e)}",
+            "huggingface_enabled": USE_HUGGINGFACE
+        }
+
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=7860)
-    
+    uvicorn.run(app, host="0.0.0.0", port=7860)