Update app.py

app.py

@@ -132,10 +132,13 @@ LABOPS_REPORTS_FOLDER_ID = get_folder_id('LabOps Reports')
 # Send AMC reminder emails
 def send_amc_reminder_emails(reminders_df):
     if reminders_df.empty:
-        logging.info("No AMC reminders to send via email.")
+        logging.info("No AMC reminders to send via email. Dataframe is empty.")
         return "No AMC reminder emails sent (no reminders found)."
 
     try:
+        # Log the reminders for debugging
+        logging.info(f"Found {len(reminders_df)} AMC reminders to send: {reminders_df.to_dict()}")
+
         # Set up the SMTP server
         server = smtplib.SMTP(SMTP_SERVER, SMTP_PORT)
         server.starttls()
@@ -144,7 +147,7 @@ def send_amc_reminder_emails(reminders_df):
         email_results = []
         for _, row in reminders_df.iterrows():
             device_id = row['device_id']
-            amc_date = row['amc_date'].strftime('%Y-%m-%d')
+            amc_date = row['amc_date'].strftime('%Y-%m-%d') if pd.notna(row['amc_date']) else "N/A"
 
             # Create the email
             msg = MIMEMultipart()
@@ -175,7 +178,7 @@ LabOps Team
         logging.error(f"Failed to send AMC reminder emails: {str(e)}")
         return f"Failed to send AMC reminder emails: {str(e)}"
 
-# Simplified Salesforce report creation
+# Updated Salesforce report creation with correct field API names
 def create_salesforce_reports(df):
     if sf is None:
         return "Salesforce connection not available."
@@ -183,39 +186,43 @@ def create_salesforce_reports(df):
         return "Cannot create reports: 'LabOps Reports' folder not found in Salesforce."
 
     try:
-        # Simplified Usage Report
+        # Usage Report (Summary Report)
         usage_report_metadata = {
             "reportMetadata": {
                 "name": f"SmartLog_Usage_Report_{datetime.now().strftime('%Y%m%d_%H%M%S')}",
-                "reportType": "SmartLog__c",
+                "developerName": f"SmartLog_Usage_Report_{datetime.now().strftime('%Y%m%d_%H%M%S')}",
+                "reportType": "CustomEntity$SmartLog__c",
                 "reportFormat": "SUMMARY",
-                "reportColumns": [
-                    {"field": "Device_Id__c"},
-                    {"field": "Usage_Hours__c", "aggregateTypes": ["Sum"]}
+                "columns": [
+                    {"field": "SmartLog__c.Device_Id__c"},
+                    {"field": "SmartLog__c.Usage_Hours__c", "aggregateTypes": ["Sum"]}
                 ],
                 "groupingsDown": [
-                    {"field": "Device_Id__c", "sortOrder": "Asc"}
+                    {"field": "SmartLog__c.Device_Id__c", "sortOrder": "Asc", "dateGranularity": "None"}
                 ],
                 "folderId": LABOPS_REPORTS_FOLDER_ID
             }
         }
+        logging.info(f"Creating Usage Report with metadata: {json.dumps(usage_report_metadata, indent=2)}")
         usage_result = sf.restful('analytics/reports', method='POST', json=usage_report_metadata)
         usage_report_id = usage_result['id']
         logging.info(f"Usage Report created: {usage_report_id}")
 
-        # Simplified AMC Reminders Report
+        # AMC Reminders Report (Tabular Report)
         amc_report_metadata = {
             "reportMetadata": {
                 "name": f"SmartLog_AMC_Reminders_{datetime.now().strftime('%Y%m%d_%H%M%S')}",
-                "reportType": "SmartLog__c",
+                "developerName": f"SmartLog_AMC_Reminders_{datetime.now().strftime('%Y%m%d_%H%M%S')}",
+                "reportType": "CustomEntity$SmartLog__c",
                 "reportFormat": "TABULAR",
-                "reportColumns": [
-                    {"field": "Device_Id__c"},
-                    {"field": "AMC_Date__c"}
+                "columns": [
+                    {"field": "SmartLog__c.Device_Id__c"},
+                    {"field": "SmartLog__c.AMC_Date__c"}
                 ],
                 "folderId": LABOPS_REPORTS_FOLDER_ID
             }
         }
+        logging.info(f"Creating AMC Reminders Report with metadata: {json.dumps(amc_report_metadata, indent=2)}")
         amc_result = sf.restful('analytics/reports', method='POST', json=amc_report_metadata)
         amc_report_id = amc_result['id']
         logging.info(f"AMC Reminders Report created: {amc_report_id}")
@@ -225,7 +232,7 @@ def create_salesforce_reports(df):
         logging.error(f"Failed to create Salesforce reports: {str(e)}")
         return f"Failed to create reports: {str(e)}"
 
-# Save results to Salesforce SmartLog__c with better AMC_Date__c handling
+# Save results to Salesforce SmartLog__c
 def save_to_salesforce(df, summary, anomalies, amc_reminders, insights):
     if sf is None:
         return "Salesforce connection not available."
@@ -332,10 +339,12 @@ def check_amc_reminders(df, current_date):
         df["days_to_amc"] = (df["amc_date"] - current_date).dt.days
         reminders = df[(df["days_to_amc"] >= 0) & (df["days_to_amc"] <= 30)][["device_id", "amc_date"]]
         if reminders.empty:
+            logging.info("No AMC reminders found within the next 30 days.")
             return "No AMC reminders due within the next 30 days.", reminders
         reminder_lines = ["Upcoming AMC Reminders:"]
         for _, row in reminders.head(5).iterrows():
             reminder_lines.append(f"- Device ID: {row['device_id']}, AMC Date: {row['amc_date']}")
+        logging.info(f"Found {len(reminders)} AMC reminders: {reminder_lines}")
         return "\n".join(reminder_lines), reminders
     except Exception as e:
         logging.error(f"AMC reminder generation failed: {str(e)}")
@@ -459,7 +468,7 @@ async def process_logs(file_obj):
         if df.empty:
             return "No data available.", None, None, None, None, None, None, None, None, None
 
-        # Run tasks concurrently but simplify execution
+        # Run tasks concurrently
         with ThreadPoolExecutor(max_workers=4) as executor:
             future_summary = executor.submit(summarize_logs, df)
             future_anomalies = executor.submit(detect_anomalies, df)