Update app.py

app.py

@@ -130,25 +130,46 @@ def create_salesforce_reports(df):
         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": {
+                    "type": "CustomObject",
+                    "value": "SmartLog__c"
+                },
                 "reportFormat": "SUMMARY",
+                "reportBooleanFilter": None,
                 "reportFilters": [
-                    {"column": "Status__c", "operator": "equals", "value": "Active"},
-                    {"column": "Timestamp__c", "operator": "greaterOrEqual", "value": "THIS_MONTH"}
-                ],
-                "reportColumns": [
-                    {"field": "Device_Id__c"},
-                    {"field": "Log_Type__c"},
-                    {"field": "Status__c"},
-                    {"field": "Timestamp__c"},
-                    {"field": "Usage_Hours__c", "aggregateTypes": ["Sum"]},
-                    {"field": "Downtime__c", "aggregateTypes": ["Sum"]},
-                    {"field": "AMC_Date__c"}
+                    {
+                        "column": "SmartLog__c.Status__c",
+                        "operator": "equals",
+                        "value": "Active"
+                    },
+                    {
+                        "column": "SmartLog__c.Timestamp__c",
+                        "operator": "greaterOrEqual",
+                        "value": "THIS_MONTH"
+                    }
                 ],
+                "aggregates": ["s!SmartLog__c.Usage_Hours__c", "s!SmartLog__c.Downtime__c"],
                 "groupingsDown": [
-                    {"field": "Device_Id__c", "sortOrder": "Asc", "dateGranularity": "None"}
+                    {
+                        "name": "Device_Id__c",
+                        "field": "SmartLog__c.Device_Id__c",
+                        "sortOrder": "Asc",
+                        "sortAggregate": None,
+                        "dateGranularity": "None"
+                    }
+                ],
+                "detailColumns": [
+                    "SmartLog__c.Device_Id__c",
+                    "SmartLog__c.Log_Type__c",
+                    "SmartLog__c.Status__c",
+                    "SmartLog__c.Timestamp__c",
+                    "SmartLog__c.Usage_Hours__c",
+                    "SmartLog__c.Downtime__c",
+                    "SmartLog__c.AMC_Date__c"
                 ],
-                "folderId": LABOPS_REPORTS_FOLDER_ID
+                "folderId": LABOPS_REPORTS_FOLDER_ID,
+                "currency": None
             }
         }
         usage_result = sf.restful('analytics/reports', method='POST', json=usage_report_metadata)
@@ -159,19 +180,37 @@ def create_salesforce_reports(df):
         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": {
+                    "type": "CustomObject",
+                    "value": "SmartLog__c"
+                },
                 "reportFormat": "TABULAR",
+                "reportBooleanFilter": None,
                 "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"}
+                    {
+                        "column": "SmartLog__c.Status__c",
+                        "operator": "equals",
+                        "value": "Active"
+                    },
+                    {
+                        "column": "SmartLog__c.AMC_Date__c",
+                        "operator": "greaterOrEqual",
+                        "value": "TODAY"
+                    },
+                    {
+                        "column": "SmartLog__c.AMC_Date__c",
+                        "operator": "lessOrEqual",
+                        "value": "NEXT_N_DAYS:30"
+                    }
                 ],
-                "reportColumns": [
-                    {"field": "Device_Id__c"},
-                    {"field": "AMC_Date__c"},
-                    {"field": "Status__c"}
+                "detailColumns": [
+                    "SmartLog__c.Device_Id__c",
+                    "SmartLog__c.AMC_Date__c",
+                    "SmartLog__c.Status__c"
                 ],
-                "folderId": LABOPS_REPORTS_FOLDER_ID
+                "folderId": LABOPS_REPORTS_FOLDER_ID,
+                "currency": None
             }
         }
         amc_result = sf.restful('analytics/reports', method='POST', json=amc_report_metadata)
@@ -195,14 +234,14 @@ def save_to_salesforce(df, summary, anomalies, amc_reminders, insights):
             # Validate and map picklist values
             status = str(row['status'])
             log_type = str(row['log_type'])
-            
+           
             # Map Status__c
             if status not in status_values:
                 status = picklist_mapping['Status__c'].get(status.lower(), status_values[0] if status_values else None)
                 if status is None:
                     logging.warning(f"Skipping record with invalid Status__c: {row['status']}")
                     continue
-            
+           
             # Map Log_Type__c
             if log_type not in log_type_values:
                 log_type = picklist_mapping['Log_Type__c'].get(log_type.lower(), log_type_values[0] if log_type_values else None)
@@ -228,7 +267,7 @@ def save_to_salesforce(df, summary, anomalies, amc_reminders, insights):
                 'AMC_Date__c': amc_date_str
             }
             records.append(record)
-        
+       
         # Bulk insert to reduce API calls
         if records:
             sf.bulk.SmartLog__c.insert(records)
@@ -391,7 +430,7 @@ async def process_logs(file_obj, progress=gr.Progress()):
 
         file_name = file_obj.name
         logging.info(f"Processing file: {file_name}")
-        
+       
         if not file_name.endswith(".csv"):
             return "Please upload a CSV file.", "", None, "", "", "", None, "", ""
 
@@ -469,39 +508,39 @@ try:
             with gr.Column(scale=2):
                 with gr.Group(elem_classes="dashboard-container"):
                     gr.Markdown("<div class='dashboard-title'>Analysis Results</div>")
-                    
+                   
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Step 1: Summary Report")
                         summary_output = gr.Markdown()
-                    
+                   
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Step 2: Log Preview")
                         preview_output = gr.Markdown()
-                        
+                       
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Step 3: Usage Chart")
                         chart_output = gr.Plot()
-                        
+                       
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Step 4: Anomaly Detection")
                         anomaly_output = gr.Markdown()
-                        
+                       
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Step 5: AMC Reminders")
                         amc_output = gr.Markdown()
-                        
+                       
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Step 6: Insights (AI)")
                         insights_output = gr.Markdown()
-                        
+                       
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Salesforce Integration")
                         salesforce_output = gr.Markdown()
-                        
+                       
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Salesforce Reports")
                         report_output = gr.Markdown()
-                        
+                       
                     with gr.Group(elem_classes="dashboard-section"):
                         gr.Markdown("### Download Report")
                         pdf_output = gr.File(label="Download Analysis Report as PDF")
@@ -535,4 +574,4 @@ if __name__ == "__main__":
     except Exception as e:
         logging.error(f"Failed to launch Gradio interface: {str(e)}")
         print(f"Error launching app: {str(e)}")
-        raise e
+        raise e