Update app.py

app.py

@@ -38,7 +38,7 @@ SMTP_SERVER = os.getenv('SMTP_SERVER', 'smtp.gmail.com')
 SMTP_PORT = int(os.getenv('SMTP_PORT', 587))
 SMTP_USERNAME = os.getenv('harishkumarr@sathkrutha.com')  # e.g., your-email@gmail.com
 SMTP_PASSWORD = os.getenv('Harish@048')  # App-specific password if using Gmail
-EMAIL_FROM = os.getenv('EMAIL_FROM', SMTP_USERNAME)
+EMAIL_FROM = os.getenv('LabOpsDashboard', SMTP_USERNAME)
 EMAIL_TO = "harishkumarr@sathkrutha.com"
 
 # Try to import reportlab
@@ -108,6 +108,27 @@ picklist_mapping = {
     }
 }
 
+# Fetch folder ID for "LabOps Reports"
+def get_folder_id(folder_name):
+    if sf is None:
+        return None
+    try:
+        query = f"SELECT Id FROM Folder WHERE Name = '{folder_name}' AND Type = 'Report'"
+        result = sf.query(query)
+        if result['totalSize'] > 0:
+            folder_id = result['records'][0]['Id']
+            logging.info(f"Found folder ID for '{folder_name}': {folder_id}")
+            return folder_id
+        else:
+            logging.error(f"Folder '{folder_name}' not found in Salesforce.")
+            return None
+    except Exception as e:
+        logging.error(f"Failed to fetch folder ID for '{folder_name}': {str(e)}")
+        return None
+
+# Cache the folder ID at startup
+LABOPS_REPORTS_FOLDER_ID = get_folder_id('LabOps Reports')
+
 # Send AMC reminder emails
 def send_amc_reminder_emails(reminders_df):
     if reminders_df.empty:
@@ -165,29 +186,35 @@ LabOps Team
 def create_salesforce_reports(df):
     if sf is None:
         return "Salesforce connection not available."
+    if not LABOPS_REPORTS_FOLDER_ID:
+        return "Cannot create reports: 'LabOps Reports' folder not found in Salesforce."
+
     try:
         # Usage Report
         usage_report_metadata = {
             "reportMetadata": {
                 "name": f"SmartLog_Usage_Report_{datetime.now().strftime('%Y%m%d_%H%M%S')}",
-                "reportType": {"type": "SmartLog__c"},
+                "reportType": "SmartLog__c",
                 "reportFormat": "SUMMARY",
-                "reportBooleanFilter": "",
                 "reportFilters": [
                     {"column": "Status__c", "operator": "equals", "value": "Active"},
                     {"column": "Timestamp__c", "operator": "greaterOrEqual", "value": "THIS_MONTH"}
                 ],
-                "reportColumns": [
-                    {"column": "Device_Id__c"},
-                    {"column": "Log_Type__c"},
-                    {"column": "Status__c"},
-                    {"column": "Timestamp__c"},
-                    {"column": "Usage_Hours__c", "aggregateTypes": ["Sum"]},
-                    {"column": "Downtime__c", "aggregateTypes": ["Sum"]},
-                    {"column": "AMC_Date__c"}
+                "detailColumns": [
+                    "Device_Id__c",
+                    "Log_Type__c",
+                    "Status__c",
+                    "Timestamp__c",
+                    "AMC_Date__c"
+                ],
+                "aggregates": [
+                    {"column": "Usage_Hours__c", "aggregate": "Sum"},
+                    {"column": "Downtime__c", "aggregate": "Sum"}
+                ],
+                "groupingsDown": [
+                    {"name": "Device_Id__c", "sortOrder": "Asc", "dateGranularity": "None"}
                 ],
-                "groupingsDown": [{"name": "Device_Id__c", "sortOrder": "Asc"}],
-                "folderName": "LabOps Reports"
+                "folderId": LABOPS_REPORTS_FOLDER_ID
             }
         }
         usage_result = sf.restful('analytics/reports', method='POST', json=usage_report_metadata)
@@ -198,20 +225,19 @@ def create_salesforce_reports(df):
         amc_report_metadata = {
             "reportMetadata": {
                 "name": f"SmartLog_AMC_Reminders_{datetime.now().strftime('%Y%m%d_%H%M%S')}",
-                "reportType": {"type": "SmartLog__c"},
+                "reportType": "SmartLog__c",
                 "reportFormat": "TABULAR",
-                "reportBooleanFilter": "",
                 "reportFilters": [
                     {"column": "Status__c", "operator": "equals", "value": "Active"},
                     {"column": "AMC_Date__c", "operator": "greaterOrEqual", "value": "TODAY"},
                     {"column": "AMC_Date__c", "operator": "lessOrEqual", "value": "NEXT_N_DAYS:30"}
                 ],
-                "reportColumns": [
-                    {"column": "Device_Id__c"},
-                    {"column": "AMC_Date__c"},
-                    {"column": "Status__c"}
+                "detailColumns": [
+                    "Device_Id__c",
+                    "AMC_Date__c",
+                    "Status__c"
                 ],
-                "folderName": "LabOps Reports"
+                "folderId": LABOPS_REPORTS_FOLDER_ID
             }
         }
         amc_result = sf.restful('analytics/reports', method='POST', json=amc_report_metadata)
@@ -325,8 +351,8 @@ def check_amc_reminders(df, current_date, progress=gr.Progress()):
             return "AMC reminders require 'device_id' and 'amc_date' columns.", pd.DataFrame()
         df["amc_date"] = pd.to_datetime(df["amc_date"], errors='coerce')
         current_date = pd.to_datetime(current_date)
-        df["days_to_amc"] = (df["days_to_amc"] >= 0) & (df["days_to_amc"] <= 30)
-        reminders = df[df["days_to_amc"]][["device_id", "amc_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:
             return "No AMC reminders due within the next 30 days.", reminders
         reminder_lines = ["Upcoming AMC Reminders:"]