Update app.py

app.py

@@ -18,27 +18,40 @@ if not API_KEY:
     logger.error("HUGGINGFACE_API_KEY environment variable not set")
     raise ValueError("HUGGINGFACE_API_KEY environment variable not set")
 
+# Model to match the incoming Vendor Log data from Salesforce
 class VendorLog(BaseModel):
     vendorLogId: str
     vendorId: str
-    workCompletionPercentage: float
-    qualityPercentage: float
-    incidentSeverity: str
-    workCompletionDate: str
-    actualCompletionDate: str
-    vendorLogName: str
-    delayDays: int
+    workDetails: str  # e.g., "90% completed"
+    qualityReport: str  # e.g., "60% quality"
+    incidentLog: str  # e.g., "Minor"
+    workCompletionDate: str  # e.g., "2025-05-12"
+    actualCompletionDate: str  # e.g., "2025-05-10"
+    vendorLogName: str  # e.g., "abhi"
+    delayDays: int  # e.g., 2
+
+# Store vendor logs for display in the dashboard
+vendor_logs = []
 
 def calculate_scores(log: VendorLog):
-    quality_score = log.qualityPercentage
+    # Extract percentages from the string fields
+    work_completion_percentage = float(log.workDetails.replace('% completed', ''))
+    quality_percentage = float(log.qualityReport.replace('% quality', ''))
+
+    # Quality Score: Directly use the quality percentage
+    quality_score = quality_percentage
 
+    # Timeliness Score: Based on delay days
     timeliness_score = 100.0 if log.delayDays <= 0 else 80.0 if log.delayDays <= 3 else 60.0 if log.delayDays <= 7 else 40.0
 
-    severity_map = {'None': 100.0, 'Low': 80.0, 'Medium': 50.0, 'High': 20.0}
-    safety_score = severity_map.get(log.incidentSeverity, 100.0)
+    # Safety Score: Based on incident severity
+    severity_map = {'None': 100.0, 'Low': 80.0, 'Minor': 80.0, 'Medium': 50.0, 'High': 20.0}
+    safety_score = severity_map.get(log.incidentLog, 100.0)
 
+    # Communication Score: Weighted average of other scores
     communication_score = (quality_score * 0.33 + timeliness_score * 0.33 + safety_score * 0.33)
 
+    # Final Score: Average of all scores
     final_score = (quality_score + timeliness_score + safety_score + communication_score) / 4
 
     return {
@@ -79,11 +92,12 @@ def generate_pdf(vendor_id: str, vendor_log_name: str, scores: dict):
     c.setFont('Helvetica', 12)
     c.drawString(100, 750, 'Subcontractor Performance Report')
     c.drawString(100, 730, f'Vendor ID: {vendor_id}')
-    c.drawString(100, 710, f'Quality Score: {scores["qualityScore"]}% ({get_feedback(scores["qualityScore"], "Quality")})')
-    c.drawString(100, 690, f'Timeliness Score: {scores["timelinessScore"]}% ({get_feedback(scores["timelinessScore"], "Timeliness")})')
-    c.drawString(100, 670, f'Safety Score: {scores["safetyScore"]}% ({get_feedback(scores["safetyScore"], "Safety")})')
-    c.drawString(100, 650, f'Communication Score: {scores["communicationScore"]}% ({get_feedback(scores["communicationScore"], "Communication")})')
-    c.drawString(100, 630, f'Final Score: {scores["finalScore"]}%')
+    c.drawString(100, 710, f'Vendor Log Name: {vendor_log_name}')
+    c.drawString(100, 690, f'Quality Score: {scores["qualityScore"]}% ({get_feedback(scores["qualityScore"], "Quality")})')
+    c.drawString(100, 670, f'Timeliness Score: {scores["timelinessScore"]}% ({get_feedback(scores["timelinessScore"], "Timeliness")})')
+    c.drawString(100, 650, f'Safety Score: {scores["safetyScore"]}% ({get_feedback(scores["safetyScore"], "Safety")})')
+    c.drawString(100, 630, f'Communication Score: {scores["communicationScore"]}% ({get_feedback(scores["communicationScore"], "Communication")})')
+    c.drawString(100, 610, f'Final Score: {scores["finalScore"]}%')
     c.save()
 
     with open(filename, 'rb') as f:
@@ -91,27 +105,32 @@ def generate_pdf(vendor_id: str, vendor_log_name: str, scores: dict):
     os.remove(filename)
     return pdf_content
 
-def determine_alert_flag(final_score: float, all_scores: list):
+def determine_alert_flag(final_score: float, all_logs: list):
+    if not all_logs:
+        return False
+    # If final score is less than 50, flag an alert
     if final_score < 50:
         return True
-    above_50 = any(score['scores']['finalScore'] >= 50 for score in all_scores)
-    if not above_50:
-        lowest_score = min([score['scores']['finalScore'] for score in all_scores])
-        return final_score == lowest_score
-    return False
-
-vendor_logs = []
+    # Otherwise, flag the vendor with the lowest final score
+    lowest_score = min([log['scores']['finalScore'] for log in all_logs])
+    return final_score == lowest_score
 
 @app.post('/score')
 async def score_vendor(log: VendorLog, authorization: str = Header(...)):
     if authorization != f'Bearer {API_KEY}':
         raise HTTPException(status_code=401, detail='Invalid API key')
 
+    # Calculate scores
     scores = calculate_scores(log)
+    
+    # Generate PDF
     pdf_content = generate_pdf(log.vendorId, log.vendorLogName, scores)
     pdf_base64 = base64.b64encode(pdf_content).decode('utf-8')
+
+    # Determine alert flag
     alert_flag = determine_alert_flag(scores['finalScore'], vendor_logs)
 
+    # Store the log and scores
     vendor_logs.append({
         'vendorLogId': log.vendorLogId,
         'vendorId': log.vendorId,
@@ -120,6 +139,7 @@ async def score_vendor(log: VendorLog, authorization: str = Header(...)):
         'extracted': True
     })
 
+    # Return the response to Salesforce
     return {
         'vendorLogId': log.vendorLogId,
         'vendorId': log.vendorId,
@@ -130,8 +150,7 @@ async def score_vendor(log: VendorLog, authorization: str = Header(...)):
         'communicationScore': scores['communicationScore'],
         'finalScore': scores['finalScore'],
         'pdfContent': pdf_base64,
-        'pdfUrl': f'/files/report_{log.vendorId}.pdf',
-        'alertFlag': alert_flag
+        'alert': alert_flag
     }
 
 @app.get('/', response_class=HTMLResponse)
@@ -149,15 +168,16 @@ async def get_dashboard():
             </style>
         </head>
         <body>
-            <h1>Subcontractor Performance Score App Generator</h1>
-            <h2>Vendor Logs</h2>
+            <h1>SUBCONTRACTOR PERFORMANCE SCORE APP GENERATOR</h1>
+            <h2>VENDOR LOGS</h2>
             <table>
                 <tr>
-                    <th>Vendor ID</th>
-                    <th>Details Extracted</th>
-                    <th>Final Score</th>
+                    <th>VENDOR ID</th>
+                    <th>DETAILS EXTRACTED FROM SALESFORCE FROM VENDOR LOG OBJECT</th>
+                    <th>FINAL SCORE CALCULATED BY APP</th>
                 </tr>
     """
+
     for log in vendor_logs:
         html_content += f"""
                 <tr>
@@ -166,9 +186,10 @@ async def get_dashboard():
                     <td>{log['scores']['finalScore'] if log['extracted'] else 'NOT CALCULATED'}</td>
                 </tr>
         """
+
     html_content += """
             </table>
-            <h2>Subcontractor Performance Scores</h2>
+            <h2>SUBCONTRACTOR PERFORMANCE SCORES</h2>
             <table>
                 <tr>
                     <th>Vendor ID</th>
@@ -181,6 +202,7 @@ async def get_dashboard():
                     <th>Alert Flag</th>
                 </tr>
     """
+
     for log in vendor_logs:
         scores = log['scores']
         alert_flag = determine_alert_flag(scores['finalScore'], vendor_logs)
@@ -196,6 +218,7 @@ async def get_dashboard():
                     <td>{'Checked' if alert_flag else 'Unchecked'}</td>
                 </tr>
         """
+
     html_content += """
             </table>
         </body>