Update app.py

app.py

@@ -100,14 +100,12 @@ def get_folder_id(folder_name):
 LABOPS_REPORTS_FOLDER_ID = get_folder_id('LabOps Reports')
 
 # Salesforce report creation
-def create_salesforce_reports(df, reminders_df):
+def create_salesforce_reports(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": {
@@ -128,10 +126,7 @@ def create_salesforce_reports(df, reminders_df):
                     "reportType": {"type": "CustomEntity", "value": "SmartLog__c"},
                     "reportFormat": "TABULAR",
                     "reportBooleanFilter": None,
-                    "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')}
-                    ],
+                    "reportFilters": [],
                     "detailColumns": ["SmartLog__c.Device_Id__c", "SmartLog__c.AMC_Date__c"],
                     "folderId": LABOPS_REPORTS_FOLDER_ID
                 }
@@ -139,7 +134,7 @@ def create_salesforce_reports(df, reminders_df):
         ]
         for report in reports:
             sf.restful('analytics/reports', method='POST', json=report)
-        logging.info("Salesforce reports created successfully with AMC reminders filter")
+        logging.info("Salesforce reports created successfully")
     except Exception as e:
         logging.error(f"Failed to create Salesforce reports: {str(e)}")
 
@@ -156,7 +151,6 @@ def save_to_salesforce(df, reminders_df):
         reminder_device_ids = set(reminders_df['device_id']) if not reminders_df.empty else set()
         logging.info(f"Processing {len(df)} records for Salesforce")
 
-        # Process all records from filtered_df
         for idx, row in df.iterrows():
             status = str(row['status']).lower()
             log_type = str(row['log_type']).lower()
@@ -189,29 +183,6 @@ def save_to_salesforce(df, reminders_df):
             }
             records.append(record)
 
-        # Process reminders_df explicitly to ensure AMC reminders are saved
-        if not reminders_df.empty:
-            logging.info(f"Processing {len(reminders_df)} AMC reminder records for Salesforce")
-            for idx, row in reminders_df.iterrows():
-                status = str(row['status']).lower()
-                log_type = str(row['log_type']).lower()
-                status_mapped = picklist_mapping['Status__c'].get(status, status_values[0] if status_values else 'Active')
-                log_type_mapped = picklist_mapping['Log_Type__c'].get(log_type, log_type_values[0] if log_type_values else 'Smart Log')
-                
-                amc_date_str = row['amc_date'].strftime('%Y-%m-%d') if pd.notna(row['amc_date']) else None
-                if amc_date_str:
-                    record = {
-                        'Device_Id__c': str(row['device_id'])[:50],
-                        'Log_Type__c': log_type_mapped,
-                        'Status__c': status_mapped,
-                        'Timestamp__c': row['timestamp'].isoformat() if pd.notna(row['timestamp']) else None,
-                        'Usage_Hours__c': float(row['usage_hours']) if pd.notna(row['usage_hours']) else 0.0,
-                        'Downtime__c': float(row['downtime']) if pd.notna(row['downtime']) else 0.0,
-                        'AMC_Date__c': amc_date_str
-                    }
-                    records.append(record)
-                    logging.info(f"Added AMC reminder for Device ID {row['device_id']} with AMC Date {amc_date_str}")
-
         if records:
             batch_size = 100
             for i in range(0, len(records), batch_size):
@@ -406,7 +377,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"}  # Fixed syntax error here
+            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
@@ -611,16 +582,16 @@ 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 and create reports
+        # Save to Salesforce after all other processing
         save_to_salesforce(filtered_df, reminders_df)
-        create_salesforce_reports(filtered_df, reminders_df)
+        create_salesforce_reports(filtered_df)
 
         elapsed_time = time.time() - start_time
         logging.info(f"Processing completed in {elapsed_time:.2f} seconds")
         if elapsed_time > 3:
             logging.warning(f"Processing time exceeded 3 seconds: {elapsed_time:.2f} seconds")
 
-        return (summary, preview_html, usage_chart, device_cards, daily_log_chart, weekly_uptime_output, anomaly_alerts_output, downtime_chart_output, anomaly_output, amc_output, insights_output, pdf_output, df, current_modified_time)
+        return (summary, preview_html, usage_chart, device_cards, daily_log_chart, weekly_uptime_chart, anomaly_alerts_chart, downtime_chart, anomalies, amc_reminders, insights, None, df, current_modified_time)
     except Exception as e:
         logging.error(f"Failed to process file: {str(e)}")
         return f"Error: {str(e)}", "<p>Error processing data.</p>", None, '<p>Error processing data.</p>', None, None, None, None, "", "", "", None, cached_df_state, last_modified_state