Update app.py

app.py

@@ -178,6 +178,32 @@ with st.sidebar:
     else:
         st.markdown('<p class="status-off">◉ DISCONNECTED</p>', unsafe_allow_html=True)
 
+    st.markdown('<div class="eg-section">Manual Override</div>', unsafe_allow_html=True)
+    manual_override = st.toggle("✏️ Set Voltage & Current Manually", value=False)
+    if manual_override:
+        ov1, ov2 = st.columns(2)
+        with ov1:
+            manual_v = st.number_input(
+                "Voltage (V)", min_value=0.0, max_value=260.0,
+                value=220.0, step=0.5,
+                help="Overrides simulated / sensor voltage"
+            )
+        with ov2:
+            manual_i = st.number_input(
+                "Current (A)", min_value=0.0, max_value=30.0,
+                value=1.80, step=0.01,
+                help="Overrides simulated / sensor current"
+            )
+        st.markdown(
+            f'<div style="font-size:0.70rem;color:#00ff99;margin:-6px 0 4px 0;">'
+            f'P = {manual_v:.1f} V × {manual_i:.3f} A = <strong style="color:#ff4466">'
+            f'{manual_v * manual_i:.1f} W</strong></div>',
+            unsafe_allow_html=True
+        )
+    else:
+        manual_v = None
+        manual_i = None
+
     st.markdown('<div class="eg-section">Settings</div>', unsafe_allow_html=True)
     rate   = st.number_input("💰 Tariff (PKR / kWh)", 1.0, 500.0, 50.0, 1.0)
     carbon = st.number_input("🌱 Carbon Factor (kg CO₂ / kWh)", 0.1, 3.0, 0.82, 0.01)
@@ -205,15 +231,24 @@ with st.sidebar:
 
 # ── Data Functions ───────────────────────────────────────────
 def _demo_reading():
-    """Simulate a realistic city-model reading."""
+    """Simulate a realistic city-model reading.
+    If manual override is active, centres the reading on the user-supplied
+    voltage and current (with a tiny noise floor so charts stay alive).
+    """
     t     = st.session_state.demo_tick
     st.session_state.demo_tick += 1
 
-    # AC voltage ~220 V with ±6 V fluctuation
-    v = 220 + 5 * math.sin(t * 0.07) + random.uniform(-2, 2)
-    # Load current varies 0.8–2.8 A (city model lamps + motors)
-    i = 1.8 + 0.6 * math.sin(t * 0.04) + 0.2 * math.sin(t * 0.13) + random.uniform(-0.05, 0.05)
-    i = max(0.1, i)
+    if manual_override and manual_v is not None and manual_i is not None:
+        # Use manual values — add ±0.5 V / ±0.005 A noise so the chart isn't flat
+        v = manual_v + random.uniform(-0.5, 0.5)
+        i = max(0.0, manual_i + random.uniform(-0.005, 0.005))
+    else:
+        # AC voltage ~220 V with ±6 V fluctuation
+        v = 220 + 5 * math.sin(t * 0.07) + random.uniform(-2, 2)
+        # Load current varies 0.8–2.8 A (city model lamps + motors)
+        i = 1.8 + 0.6 * math.sin(t * 0.04) + 0.2 * math.sin(t * 0.13) + random.uniform(-0.05, 0.05)
+        i = max(0.1, i)
+
     p = v * i
 
     dt_h = 1 / 3600
@@ -531,25 +566,20 @@ with tab3:
         st.plotly_chart(fig_h, use_container_width=True)
 
         # AI Prediction (linear regression on energy)
-        reg_df = df.copy()
-        reg_df['energy_kwh'] = pd.to_numeric(reg_df['energy_kwh'], errors='coerce')
-        reg_df['timestamp'] = pd.to_datetime(reg_df['timestamp'], errors='coerce')
-        reg_df = reg_df.dropna(subset=['energy_kwh', 'timestamp']).reset_index(drop=True)
-
-        if len(reg_df) >= 15:
+        if len(df) >= 15:
             st.markdown('<div class="eg-section">AI Energy Prediction (Linear Regression)</div>',
                         unsafe_allow_html=True)
-            x = np.arange(len(reg_df), dtype=float)
-            y = reg_df['energy_kwh'].to_numpy(dtype=float)
+            x = np.arange(len(df))
+            y = df['energy_kwh'].values
             coeffs = np.polyfit(x, y, 1)
 
             n_future = 60
-            fx = np.arange(len(reg_df), len(reg_df) + n_future, dtype=float)
+            fx = np.arange(len(df), len(df) + n_future)
             fy = np.polyval(coeffs, fx)
-            ft = [reg_df['timestamp'].iloc[-1] + timedelta(seconds=i) for i in range(1, n_future+1)]
+            ft = [df['timestamp'].iloc[-1] + timedelta(seconds=i) for i in range(1, n_future+1)]
 
             fig_pr = go.Figure()
-            fig_pr.add_trace(go.Scatter(x=reg_df['timestamp'], y=reg_df['energy_kwh'],
+            fig_pr.add_trace(go.Scatter(x=df['timestamp'], y=df['energy_kwh'],
                                         name='Actual', line=dict(color='#00ff99', width=2)))
             fig_pr.add_trace(go.Scatter(x=ft, y=fy,
                                         name='Predicted (60 s)', yaxis='y1',
@@ -576,8 +606,7 @@ with tab3:
         st.markdown('<div class="eg-section">Data Log (last 50 readings)</div>',
                     unsafe_allow_html=True)
         disp = df.tail(50).copy()
-        disp['timestamp'] = pd.to_datetime(disp['timestamp'], errors='coerce')
-        disp['timestamp'] = disp['timestamp'].dt.strftime('%H:%M:%S').fillna('--:--:--')
+        disp['timestamp'] = disp['timestamp'].dt.strftime('%H:%M:%S')
         st.dataframe(disp, use_container_width=True, height=260)
 
         csv_bytes = df.to_csv(index=False).encode()
@@ -628,31 +657,16 @@ with tab4:
                 # ── AI Recommendations ──────────────────────
                 recs = []
                 if avg_p > 500:
-                    recs.append("HIGH load detected - consider switching off idle appliances.")
+                    recs.append("HIGH load detected — consider switching off idle appliances.")
                 if avg_v < 210 or avg_v > 235:
-                    recs.append("Voltage outside safe range (210-235 V) - check power supply.")
+                    recs.append("Voltage outside safe range (210–235 V) — check power supply.")
                 if df['voltage'].std() > 8:
-                    recs.append("High voltage fluctuation - consider a voltage stabiliser.")
+                    recs.append("High voltage fluctuation — consider a voltage stabiliser.")
                 recs.append("Use LED lighting to reduce city model consumption by ~70%.")
-                recs.append("Schedule high-load demos during off-peak hours (22:00-06:00).")
+                recs.append("Schedule high-load demos during off-peak hours (22:00–06:00).")
                 recs.append("Install capacitor banks to improve power factor.")
                 recs.append("Regular maintenance reduces standby losses significantly.")
 
-                def pdf_safe(text):
-                    if text is None:
-                        return ""
-                    normalized = str(text).translate(str.maketrans({
-                        "–": "-",
-                        "—": "-",
-                        "•": "|",
-                        "°": " deg",
-                        "₂": "2",
-                        "₨": "Rs",
-                        "✓": "[+]",
-                        "⚠": "[!]",
-                    }))
-                    return normalized.encode("latin-1", "replace").decode("latin-1")
-
                 # ── Build PDF ───────────────────────────────
                 class EnergyPDF(FPDF):
                     def header(self):
@@ -669,14 +683,14 @@ with tab4:
                         self.set_font('Helvetica', 'B', 14)
                         self.set_text_color(0, 200, 255)
                         self.set_xy(8, 4)
-                        self.cell(100, 7, pdf_safe('ENERGYGURU - POWER CALCULUS'), ln=False)
+                        self.cell(100, 7, 'ENERGYGURU – POWER CALCULUS', ln=False)
 
                         self.set_font('Helvetica', '', 7)
                         self.set_text_color(80, 120, 160)
                         self.set_xy(8, 13)
-                        self.cell(0, 5, pdf_safe(
+                        self.cell(0, 5,
                                   f'AI-Assisted Energy Usage Analyzer  |  '
-                                  f'Generated: {datetime.now():%Y-%m-%d %H:%M:%S}'))
+                                  f'Generated: {datetime.now():%Y-%m-%d %H:%M:%S}')
                         self.ln(14)
 
                     def footer(self):
@@ -684,7 +698,7 @@ with tab4:
                         self.set_font('Helvetica', 'I', 7)
                         self.set_text_color(50, 70, 100)
                         self.cell(0, 8,
-                                  pdf_safe(f'EnergyGuru Power Calculus  |  {institution}  |  Page {self.page_no()}'),
+                                  f'EnergyGuru Power Calculus  |  {institution}  |  Page {self.page_no()}',
                                   align='C')
 
                     def section_title(self, txt):
@@ -694,7 +708,7 @@ with tab4:
                         self.rect(self.get_x(), self.get_y(), 185, 8, 'DF')
                         self.set_font('Helvetica', 'B', 9)
                         self.set_text_color(0, 200, 255)
-                        self.cell(0, 8, pdf_safe(f'  {txt}'), ln=True)
+                        self.cell(0, 8, f'  {txt}', ln=True)
                         self.ln(2)
 
                     def kv_row(self, label, value, fill_idx):
@@ -704,10 +718,10 @@ with tab4:
                             self.set_fill_color(10, 16, 28)
                         self.set_text_color(100, 140, 180)
                         self.set_font('Helvetica', '', 9)
-                        self.cell(90, 7, pdf_safe(f'  {label}'), fill=True)
+                        self.cell(90, 7, f'  {label}', fill=True)
                         self.set_text_color(220, 230, 240)
                         self.set_font('Helvetica', 'B', 9)
-                        self.cell(95, 7, pdf_safe(f'  {value}'), fill=True, ln=True)
+                        self.cell(95, 7, f'  {value}', fill=True, ln=True)
 
                 pdf = EnergyPDF()
                 pdf.set_auto_page_break(auto=True, margin=18)
@@ -716,16 +730,16 @@ with tab4:
                 # Title block
                 pdf.set_font('Helvetica', 'B', 17)
                 pdf.set_text_color(0, 200, 255)
-                pdf.cell(0, 10, pdf_safe(rpt_title), ln=True, align='C')
+                pdf.cell(0, 10, rpt_title, ln=True, align='C')
                 pdf.ln(1)
 
                 pdf.set_font('Helvetica', '', 9)
                 pdf.set_text_color(80, 120, 160)
-                pdf.cell(0, 6, pdf_safe(f'Institution: {institution}    |    Project: {project_id}'), ln=True, align='C')
-                pdf.cell(0, 6, pdf_safe(f'Location: {city_choice}   |   Lat {loc["lat"]:.4f} deg  Lon {loc["lon"]:.4f} deg'), ln=True, align='C')
+                pdf.cell(0, 6, f'Institution: {institution}    |    Project: {project_id}', ln=True, align='C')
+                pdf.cell(0, 6, f'Location: {city_choice}   •   Lat {loc["lat"]:.4f}°  Lon {loc["lon"]:.4f}°', ln=True, align='C')
                 if operator:
-                    pdf.cell(0, 6, pdf_safe(f'Operator: {operator}'), ln=True, align='C')
-                pdf.cell(0, 6, pdf_safe(f'Date: {datetime.now():%B %d, %Y}    Time: {datetime.now():%H:%M:%S}'), ln=True, align='C')
+                    pdf.cell(0, 6, f'Operator: {operator}', ln=True, align='C')
+                pdf.cell(0, 6, f'Date: {datetime.now():%B %d, %Y}    Time: {datetime.now():%H:%M:%S}', ln=True, align='C')
                 pdf.ln(4)
 
                 # Divider
@@ -744,7 +758,7 @@ with tab4:
                     ("Minimum Power",           f"{min_p:.2f} W"),
                     ("Total Energy Consumed",   f"{tot_e:.6f} kWh"),
                     ("Electricity Bill",        f"PKR {tot_b:.4f}"),
-                    ("Carbon Footprint",        f"{tot_co2:.6f} kg CO2"),
+                    ("Carbon Footprint",        f"{tot_co2:.6f} kg CO₂"),
                     ("Tariff Rate",             f"PKR {rate:.2f} / kWh"),
                     ("Carbon Factor",           f"{carbon:.2f} kg CO₂ / kWh"),
                     ("Total Readings",          f"{n_reads}"),
@@ -788,7 +802,7 @@ with tab4:
                 # ── Section 3: Last 20 readings ──────────────
                 pdf.section_title('3.  RECENT READINGS  (last 20)')
                 hdrs   = ['Time',    'V (V)',  'I (A)',  'P (W)',
-                          'kWh',     'Bill Rs', 'CO2 kg']
+                          'kWh',     'Bill ₨', 'CO₂ kg']
                 c_widths = [26, 22, 22, 25, 32, 30, 28]
 
                 # Table header
@@ -796,7 +810,7 @@ with tab4:
                 pdf.set_text_color(0, 200, 255)
                 pdf.set_font('Helvetica', 'B', 8)
                 for h, w in zip(hdrs, c_widths):
-                    pdf.cell(w, 7, pdf_safe(h), fill=True, align='C')
+                    pdf.cell(w, 7, h, fill=True, align='C')
                 pdf.ln()
 
                 pdf.set_font('Helvetica', '', 8)
@@ -814,7 +828,7 @@ with tab4:
                             f"{row['bill_pkr']:.4f}",
                             f"{row['carbon_kg']:.6f}"]
                     for v, w in zip(vals, c_widths):
-                        pdf.cell(w, 6, pdf_safe(v), fill=True, align='C')
+                        pdf.cell(w, 6, v, fill=True, align='C')
                     pdf.ln()
                 pdf.ln(4)
 
@@ -822,10 +836,10 @@ with tab4:
                 pdf.section_title('4.  AI ENERGY RECOMMENDATIONS')
                 pdf.set_font('Helvetica', '', 9)
                 for i, rec in enumerate(recs):
-                    icon = '[!]' if rec.startswith('HIGH') or rec.startswith('Voltage') or rec.startswith('High') else '[+]'
-                    clr = (255, 180, 60) if icon == '[!]' else (100, 220, 130)
+                    icon = '⚠' if rec.startswith('HIGH') or rec.startswith('Voltage') or rec.startswith('High') else '✓'
+                    clr = (255, 180, 60) if icon == '⚠' else (100, 220, 130)
                     pdf.set_text_color(*clr)
-                    pdf.cell(0, 8, pdf_safe(f'  {icon}  {rec}'), ln=True)
+                    pdf.cell(0, 8, f'  {icon}  {rec}', ln=True)
                 pdf.ln(3)
 
                 # ── Notes ────────────────────────────────────
@@ -839,7 +853,7 @@ with tab4:
                     pdf.set_font('Helvetica', '', 8)
                     pdf.set_text_color(140, 160, 180)
                     for ln_text in notes.split('\n'):
-                        pdf.cell(0, 6, pdf_safe(ln_text), ln=True)
+                        pdf.cell(0, 6, ln_text, ln=True)
 
                 # ── Output ───────────────────────────────────
                 pdf_bytes = bytes(pdf.output())
@@ -867,4 +881,4 @@ with tab4:
 # ── Auto refresh (live updates) ──────────────────────────────
 if st.session_state.demo_mode or st.session_state.connected:
     time.sleep(1)
-    st.rerun()
+    st.rerun()