Update app.py

app.py

@@ -4,40 +4,42 @@ from tariff_scraper import scrape_tariff_data
 def main():
     st.title("Electricity Bill Calculator with Tariff Scraper")
     
-    # Default URL for scraping tariff rates
-    url = "https://iesco.com.pk/index.php/customer-services/tariff-guide"
-    
-    # Scrape tariff rates
-    tariff_rate = 0.0
-    with st.spinner("Fetching tariff rates..."):
-        data = scrape_tariff_data(url)
-        if isinstance(data, list) and data:
-            # Extract tariff rate from the scraped data
-            # Assuming tariff rate is mentioned as a numeric value in PKR/unit
-            for row in data:
-                if "PKR" in row:  # Replace with specific logic matching the structure of the scraped data
-                    try:
-                        tariff_rate = float(row.split()[1])  # Adjust this parsing logic based on your data
-                        break
-                    except (ValueError, IndexError):
-                        continue
-        if tariff_rate == 0.0:
-            st.warning("Could not fetch tariff rates. Using default rate of PKR 20.0/unit.")
-            tariff_rate = 20.0  # Default rate
+    # Fetch tariff rates
+    st.sidebar.subheader("Tariff Rates")
+    url = st.sidebar.text_input("Tariff URL", "https://iesco.com.pk/index.php/customer-services/tariff-guide")
+
+    if st.sidebar.button("Fetch Tariff Rates"):
+        with st.spinner("Fetching tariff rates..."):
+            data = scrape_tariff_data(url)
+            if isinstance(data, dict):  # Check if data is a valid dictionary
+                st.session_state["tariff_rates"] = data
+                st.sidebar.success("Tariff rates fetched successfully!")
+                st.write("### Tariff Rates")
+                for category, rate in data.items():
+                    st.write(f"{category}: {rate} PKR/unit")
+            else:
+                st.sidebar.error(data)
+
+    # Use fetched tariff rates
+    tariff_categories = st.session_state.get("tariff_rates", {})
+    if tariff_categories:
+        load_type = st.sidebar.selectbox("Select Load Type", options=tariff_categories.keys())
+        tariff_rate = tariff_categories.get(load_type, 0.0)
+    else:
+        st.sidebar.warning("Using default rate. Fetch tariff rates to use live data.")
+        load_type = "Default"
+        tariff_rate = st.sidebar.number_input("Default Tariff Rate (PKR/unit)", min_value=0.0, value=20.0)
 
-    # Electricity Bill Calculator Section
-    st.write("## Electricity Bill Calculator")
+    # Electricity bill calculation
     st.sidebar.subheader("Appliance Usage")
-    
     appliances = {
         "Fan": 75, "Air Conditioner (1 Ton)": 1500, "Refrigerator": 150,
         "LED Bulb (20W)": 20, "Iron": 1000, "Microwave Oven": 1200
     }
-    
-    appliance = st.sidebar.selectbox("Select Appliance", options=list(appliances.keys()))
+    appliance = st.sidebar.selectbox("Select Appliance", options=appliances.keys())
     quantity = st.sidebar.number_input("Quantity", min_value=1, value=1)
     usage_hours = st.sidebar.number_input("Usage Hours/Day", min_value=1.0, value=6.0)
-    
+
     if st.sidebar.button("Add Appliance"):
         st.session_state.setdefault("appliances", []).append({
             "appliance": appliance,
@@ -47,24 +49,20 @@ def main():
         })
         st.sidebar.success(f"{quantity} x {appliance} added.")
 
-    # Display Appliances
+    # Display appliances and calculate bill
     st.write("### Selected Appliances")
     if "appliances" in st.session_state:
         for app in st.session_state["appliances"]:
             st.write(f"{app['quantity']} x {app['appliance']} ({app['usage_hours']} hours/day)")
-    else:
-        st.write("No appliances added yet.")
-
-    # Calculate and Display Bill
-    if st.button("Calculate Bill"):
-        if "appliances" in st.session_state:
+        
+        if st.button("Calculate Bill"):
             total_units = sum(
                 app["quantity"] * app["load"] * app["usage_hours"] / 1000 for app in st.session_state["appliances"]
             )
             bill = total_units * 30 * tariff_rate
-            st.success(f"Estimated Monthly Bill: PKR {bill:.2f} (Tariff Rate: PKR {tariff_rate:.2f}/unit)")
-        else:
-            st.warning("No appliances added for calculation.")
+            st.success(f"Estimated Monthly Bill for {load_type}: PKR {bill:.2f}")
+    else:
+        st.write("No appliances added yet.")
 
 if __name__ == "__main__":
     main()