Update app.py

app.py

@@ -100,12 +100,14 @@ def get_folder_id(folder_name):
 LABOPS_REPORTS_FOLDER_ID = get_folder_id('LabOps Reports')
 
 # Salesforce report creation
-def create_salesforce_reports(df):
+def create_salesforce_reports(df, reminders_df):
     if sf is None or not LABOPS_REPORTS_FOLDER_ID:
         logging.error("Cannot create Salesforce reports: No connection or folder ID")
         return
     try:
         timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
+        current_date = datetime.now()
+        next_30_days = current_date + timedelta(days=30)
         reports = [
             {
                 "reportMetadata": {
@@ -126,7 +128,10 @@ def create_salesforce_reports(df):
                     "reportType": {"type": "CustomEntity", "value": "SmartLog__c"},
                     "reportFormat": "TABULAR",
                     "reportBooleanFilter": None,
-                    "reportFilters": [],
+                    "reportFilters": [
+                        {"column": "AMC_Date__c", "operator": "greaterOrEqual", "value": current_date.strftime('%Y-%m-%d')},
+                        {"column": "AMC_Date__c", "operator": "lessOrEqual", "value": next_30_days.strftime('%Y-%m-%d')}
+                    ],
                     "detailColumns": ["SmartLog__c.Device_Id__c", "SmartLog__c.AMC_Date__c"],
                     "folderId": LABOPS_REPORTS_FOLDER_ID
                 }
@@ -134,7 +139,7 @@ def create_salesforce_reports(df):
         ]
         for report in reports:
             sf.restful('analytics/reports', method='POST', json=report)
-        logging.info("Salesforce reports created successfully")
+        logging.info("Salesforce reports created successfully with AMC reminders filter")
     except Exception as e:
         logging.error(f"Failed to create Salesforce reports: {str(e)}")
 
@@ -401,7 +406,7 @@ def create_anomaly_alerts_chart(anomalies_df):
             x='date',
             y='anomaly_count',
             title="Anomaly Alerts Over Time",
-            labels={"date": "Date", "anomaly_count": "Number of Anomalies"}
+            labels{"date": "Date", "anomaly_count": "Number of Anomalies"}
         )
         fig.update_layout(title_font_size=16, margin=dict(l=20, r=20, t=40, b=20))
         return fig
@@ -606,9 +611,9 @@ async def process_logs(file_obj, lab_site_filter, equipment_type_filter, date_ra
         anomaly_alerts_chart = create_anomaly_alerts_chart(anomalies_df)
         device_cards = generate_device_cards(filtered_df)
 
-        # Save to Salesforce after all other processing
+        # Save to Salesforce and create reports
         save_to_salesforce(filtered_df, reminders_df)
-        create_salesforce_reports(filtered_df)
+        create_salesforce_reports(filtered_df, reminders_df)
 
         elapsed_time = time.time() - start_time
         logging.info(f"Processing completed in {elapsed_time:.2f} seconds")