Update app.py

app.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI, HTTPException, Header
+from flask import Flask, request, Response, jsonify, render_template_string
 from pydantic import BaseModel
 from reportlab.lib.pagesizes import letter
 from reportlab.pdfgen import canvas
@@ -8,14 +8,13 @@ import logging
 import traceback
 import html  # For escaping special characters
 from datetime import datetime
-from fastapi.responses import HTMLResponse
 from simple_salesforce import Salesforce
 
 # Set up logging to capture errors and debug information
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-app = FastAPI()
+app = Flask(__name__)
 
 # Salesforce credentials
 SF_USERNAME = "scores@app.com"
@@ -148,13 +147,26 @@ def determine_alert_flag(final_score: float, all_logs: list):
         logger.error(f"Error determining alert flag: {str(e)}")
         raise
 
-@app.post('/score')
-async def score_vendor(log: VendorLog, authorization: str = Header(...)):
+@app.route('/score', methods=['POST'])
+def score_vendor():
     try:
+        # Validate the Authorization header
+        authorization = request.headers.get('Authorization')
+        if not authorization:
+            return jsonify({'error': 'Authorization header missing'}), 401
+
+        # Parse the request data
+        data = request.get_json()
+        if not data:
+            return jsonify({'error': 'Invalid request data'}), 400
+
+        # Validate and create VendorLog instance
+        log = VendorLog(**data)
         logger.info(f"Received Vendor Log: {log}")
-        # Validate Salesforce session or token (optional, depending on your setup)
+
+        # Validate Salesforce session
         if not sf.session_id:
-            raise HTTPException(status_code=401, detail='Salesforce session invalid')
+            return jsonify({'error': 'Salesforce session invalid'}), 401
 
         # Calculate scores
         scores = calculate_scores(log)
@@ -182,7 +194,7 @@ async def score_vendor(log: VendorLog, authorization: str = Header(...)):
             'extracted': True
         })
 
-        # Optionally, save scores back to Salesforce (example mapping to a custom object)
+        # Optionally, save scores back to Salesforce
         try:
             sf.Vendor_Log__c.create({
                 'Vendor_Log_Id__c': log.vendorLogId,
@@ -194,15 +206,15 @@ async def score_vendor(log: VendorLog, authorization: str = Header(...)):
                 'Communication_Score__c': scores['communicationScore'],
                 'Final_Score__c': scores['finalScore'],
                 'Alert_Flag__c': alert_flag,
-                'PDF_Content__c': pdf_base64  # Assuming a text field for base64 PDF
+                'PDF_Content__c': pdf_base64
             })
             logger.info(f"Successfully saved scores to Salesforce for Vendor Log: {log.vendorLogId}")
         except Exception as e:
             logger.error(f"Error saving to Salesforce: {str(e)}")
-            # Continue even if Salesforce save fails to ensure response is returned
+            # Continue even if Salesforce save fails
 
-        # Return the response to the caller
-        return {
+        # Return the response
+        return jsonify({
             'vendorLogId': log.vendorLogId,
             'vendorId': log.vendorId,
             'vendorLogName': log.vendorLogName,
@@ -213,19 +225,19 @@ async def score_vendor(log: VendorLog, authorization: str = Header(...)):
             'finalScore': scores['finalScore'],
             'pdfContent': pdf_base64,
             'alert': alert_flag
-        }
+        }), 200
     except Exception as e:
         logger.error(f"Error in /score endpoint: {str(e)}")
-        raise HTTPException(status_code=500, detail=f"Error processing vendor log: {str(e)}")
+        return jsonify({'error': f"Error processing vendor log: {str(e)}"}), 500
 
-@app.get('/', response_class=HTMLResponse)
-async def get_dashboard():
+@app.route('/', methods=['GET'])
+def get_dashboard():
     try:
         # Calculate summary metrics
         total_vendors = len(vendor_logs)
         performance_alerts = sum(1 for log in vendor_logs if determine_alert_flag(log['scores']['finalScore'], vendor_logs))
         top_performers = sum(1 for log in vendor_logs if log['scores']['finalScore'] >= 90)
-        improving_vendors = sum(1 for log in vendor_logs if log['scores']['finalScore'] >= 70)  # Simplified logic for "improving"
+        improving_vendors = sum(1 for log in vendor_logs if log['scores']['finalScore'] >= 70)
 
         # Sort vendor logs by final score for leaderboard
         sorted_logs = sorted(vendor_logs, key=lambda x: x['scores']['finalScore'], reverse=True)
@@ -235,6 +247,7 @@ async def get_dashboard():
 
         # HTML content for the dashboard
         html_content = """
+        <!DOCTYPE html>
         <html>
             <head>
                 <title>Subcontractor Performance Score App</title>
@@ -278,17 +291,17 @@ async def get_dashboard():
                         <div class="card">
                             <h3>Performance Alerts</h3>
                             <p>{performance_alerts}</p>
-                            <small>{round(performance_alerts/total_vendors*100, 1) if total_vendors else 0}% of vendors</small>
+                            <small>{percent_alerts}% of vendors</small>
                         </div>
                         <div class="card">
                             <h3>Top Performers</h3>
                             <p>{top_performers}</p>
-                            <small>{round(top_performers/total_vendors*100, 1) if total_vendors else 0}% of vendors</small>
+                            <small>{percent_top}% of vendors</small>
                         </div>
                         <div class="card">
                             <h3>Improving Vendors</h3>
                             <p>{improving_vendors}</p>
-                            <small>{round(improving_vendors/total_vendors*100, 1) if total_vendors else 0}% of vendors</small>
+                            <small>{percent_improving}% of vendors</small>
                         </div>
                     </div>
 
@@ -304,7 +317,15 @@ async def get_dashboard():
                                 <th>Trend</th>
                                 <th>Status</th>
                             </tr>
-        """.format(total_vendors=total_vendors, performance_alerts=performance_alerts, top_performers=top_performers, improving_vendors=improving_vendors)
+        """.format(
+            total_vendors=total_vendors,
+            performance_alerts=performance_alerts,
+            percent_alerts=round(performance_alerts/total_vendors*100, 1) if total_vendors else 0,
+            top_performers=top_performers,
+            percent_top=round(top_performers/total_vendors*100, 1) if total_vendors else 0,
+            improving_vendors=improving_vendors,
+            percent_improving=round(improving_vendors/total_vendors*100, 1) if total_vendors else 0
+        )
 
         for idx, log in enumerate(top_logs, 1):
             scores = log['scores']
@@ -312,7 +333,6 @@ async def get_dashboard():
             trend = "trend-up" if scores['finalScore'] >= 90 else "trend-down" if scores['finalScore'] < 70 else "trend-flat"
             status_class = "status-good" if not alert_flag else "status-alert"
             status_text = "Good" if not alert_flag else "Alert"
-            # Escape dynamic data to prevent HTML injection
             vendor_name = html.escape(log['vendorLogName'])
             html_content += f"""
                             <tr>
@@ -440,14 +460,12 @@ async def get_dashboard():
             </body>
         </html>
         """
-        # Ensure the HTML content is properly encoded
-        return HTMLResponse(content=html_content.encode('utf-8'), media_type="text/html; charset=utf-8")
+        # Return the HTML response with proper encoding
+        return Response(html_content, mimetype='text/html; charset=utf-8')
     except Exception as e:
-        # Log the full stack trace for better debugging
         error_trace = traceback.format_exc()
         logger.error(f"Error in / endpoint: {str(e)}\nStack trace:\n{error_trace}")
-        raise HTTPException(status_code=500, detail=f"Error generating dashboard: {str(e)}")
+        return jsonify({'error': f"Error generating dashboard: {str(e)}"}), 500
 
 if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    app.run(host="0.0.0.0", port=7860, debug=True)