Update app.py

app.py

@@ -1,66 +1,129 @@
 import streamlit as st
-import requests
 import pandas as pd
-import simple_salesforce
-
-# ---------------------- CONFIG ----------------------
-CLIENT_ID = "3MVG9VMBZCsTL9hnfx2eVMOHa56mwSZnvuAnPr3kVVBEQfeLYvrSfJNRRjjSlKWPLy99XM6kefg=="
-CLIENT_SECRET = "6F7E9C95CE20CC07FC1EBD39B34909739D99975A0EEB548240926EA0686E428E"
-USERNAME = "greenenergy@vedavathi.com"
-PASSWORD = "Vedavathi@04"+"qe4His8AcuFJucZz5NBHfGU"  # Keep this as the password (without the security token)
-TOKEN_URL = "https://login.salesforce.com/services/oauth2/token"  # For production
-API_VERSION = "v60.0"
-
-# ---------------------- AUTH ----------------------
-@st.cache_data
-def get_salesforce_token():
-    data = {
-        "grant_type": "Vedavathi@04"+"qe4His8AcuFJucZz5NBHfGU",  # Corrected grant_type
-        "client_id": "3MVG9VMBZCsTL9hnfx2eVMOHa56mwSZnvuAnPr3kVVBEQfeLYvrSfJNRRjjSlKWPLy99XM6kefg==",
-        "client_secret":"6F7E9C95CE20CC07FC1EBD39B34909739D99975A0EEB548240926EA0686E428E" ,
-        "username":"greenenergy@vedavathi.com" ,
-        "password":"Vedavathi@04"+"qe4His8AcuFJucZz5NBHfGU"  # Correctly concatenate password and security token
-    }
-    response = requests.post(TOKEN_URL, data=data)
-    
-    if response.status_code != 200:
-        # Log detailed error message for better debugging
-        error_message = response.json() if response.status_code != 200 else "No error message"
-        st.error(f"Authentication failed! Status code: {response.status_code}, Message: {error_message}")
-        return None, None
-    
-    res = response.json()
-    return res["access_token"], res["instance_url"]
-
-# ---------------------- FETCH DATA ----------------------
-def fetch_pole_data(instance_url, access_token):
-    headers = {
-        "Authorization": f"Bearer {access_token}"
-    }
-    query = "SELECT Name, Location_Latitude__c, Location_Longitude__c, Camera_Status__c FROM Pole__c LIMIT 100"
-    url = f"{instance_url}/services/data/{API_VERSION}/query?q={query}"
-    response = requests.get(url, headers=headers)
-    
-    if response.status_code != 200:
-        st.error(f"Failed to fetch Pole data! Status code: {response.status_code}, Message: {response.json()}")
-        return pd.DataFrame()
-    
-    records = response.json().get("records", [])
-    df = pd.DataFrame(records)
-    return df[["Name", "Location_Latitude__c", "Location_Longitude__c", "Camera_Status__c"]]
-
-# ---------------------- UI ----------------------
-st.title("🚦Vedavathi Smart Poles Viewer")
-
-token, instance_url = get_salesforce_token()
-
-if token:
-    if st.button("🔄 Refresh Pole Data"):
-        df = fetch_pole_data(instance_url, token)
-        if not df.empty:
-            st.success("Pole data loaded successfully!")
-            st.dataframe(df, use_container_width=True)
-        else:
-            st.warning("No data found.")
+import plotly.express as px
+from simple_salesforce import Salesforce
+
+# Page configuration
+st.set_page_config(page_title="Vedavathi Pole Dashboard", layout="wide")
+
+# -------------------------------
+# Connect to Salesforce
+# -------------------------------
+@st.cache_resource
+def connect_salesforce():
+    try:
+        sf = Salesforce(
+            username="greenenergy@vedavathi.com",
+            password="Vedavathi@04",
+            security_token="jqe4His8AcuFJucZz5NBHfGU",
+            domain="login"
+        )
+        return sf
+    except Exception as e:
+        st.error(f"❌ Failed to connect to Salesforce: {e}")
+        return None
+
+sf = connect_salesforce()
+
+# -------------------------------
+# Main App Logic
+# -------------------------------
+if sf:
+    st.success("✅ Connected to Salesforce")
+
+    # Query Pole data
+    query = """
+        SELECT Id, Name, Location__c, Status__c, Power_Generation__c, 
+               Fault_Status__c, Last_Maintenance_Date__c, Installed_Date__c
+        FROM Pole__c
+        LIMIT 1000
+    """
+    result = sf.query_all(query)
+    df = pd.DataFrame(result['records']).drop(columns='attributes')
+
+    # Clean and format data
+    df['Installed_Date__c'] = pd.to_datetime(df['Installed_Date__c'])
+    df['Last_Maintenance_Date__c'] = pd.to_datetime(df['Last_Maintenance_Date__c'])
+    df['Power_Generation__c'] = pd.to_numeric(df['Power_Generation__c'], errors='coerce')
+
+    # Sidebar filters
+    st.sidebar.header("🔍 Filters")
+    status_filter = st.sidebar.multiselect("Select Pole Status", df['Status__c'].unique(), default=df['Status__c'].unique())
+    fault_filter = st.sidebar.multiselect("Select Fault Status", df['Fault_Status__c'].unique(), default=df['Fault_Status__c'].unique())
+
+    # Apply filters
+    filtered_df = df[
+        df['Status__c'].isin(status_filter) &
+        df['Fault_Status__c'].isin(fault_filter)
+    ]
+
+    st.title("⚡ Vedavathi Smart Pole Dashboard")
+
+    # -------------------------------
+    # 📋 Data Table
+    # -------------------------------
+    st.subheader("📋 Pole Data Table")
+    st.dataframe(filtered_df)
+
+    # -------------------------------
+    # 🔋 Bar Chart - Power Generation
+    # -------------------------------
+    st.subheader("🔋 Power Generation per Pole")
+    fig_bar = px.bar(
+        filtered_df,
+        x='Name',
+        y='Power_Generation__c',
+        color='Status__c',
+        title="Power Output by Pole",
+        height=400
+    )
+    st.plotly_chart(fig_bar, use_container_width=True)
+
+    # -------------------------------
+    # ⚠️ Pie Chart - Fault Status
+    # -------------------------------
+    st.subheader("⚠️ Fault Status Distribution")
+    pie_data = filtered_df['Fault_Status__c'].value_counts().reset_index()
+    pie_data.columns = ['Fault Status', 'Count']
+    fig_pie = px.pie(
+        pie_data,
+        names='Fault Status',
+        values='Count',
+        title="Fault Breakdown",
+        height=400
+    )
+    st.plotly_chart(fig_pie, use_container_width=True)
+
+    # -------------------------------
+    # 🕒 Line Chart - Installations
+    # -------------------------------
+    st.subheader("🕒 Installation Trend")
+    install_trend = filtered_df.groupby(filtered_df['Installed_Date__c'].dt.to_period('M')).size()
+    install_trend.index = install_trend.index.to_timestamp()
+    fig_line_install = px.line(
+        x=install_trend.index,
+        y=install_trend.values,
+        labels={"x": "Month", "y": "Poles Installed"},
+        title="Installations Over Time",
+        markers=True
+    )
+    st.plotly_chart(fig_line_install, use_container_width=True)
+
+    # -------------------------------
+    # 🛠️ Line Chart - Maintenance
+    # -------------------------------
+    st.subheader("🛠️ Maintenance Trend")
+    maint_trend = filtered_df.groupby(filtered_df['Last_Maintenance_Date__c'].dt.to_period('M')).size()
+    maint_trend.index = maint_trend.index.to_timestamp()
+    fig_line_maint = px.line(
+        x=maint_trend.index,
+        y=maint_trend.values,
+        labels={"x": "Month", "y": "Maintenance Events"},
+        title="Maintenance Over Time",
+        markers=True
+    )
+    st.plotly_chart(fig_line_maint, use_container_width=True)
+
 else:
-    st.error("Salesforce authentication failed. Check credentials.")
+    st.error("❌ Could not connect to Salesforce. Check your credentials.")
+