Valtry commited on
Commit
b7e3734
·
verified ·
1 Parent(s): a2de8d2

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -2
app.py CHANGED
@@ -32,6 +32,7 @@ class Features(BaseModel):
32
  range: float
33
  peak_count: int
34
  slope: float
 
35
 
36
  # ---------------- FEATURE ENGINEERING ----------------
37
  def transform_features(data: Features):
@@ -86,8 +87,8 @@ def predict(data: Features):
86
  appliance = "Unknown"
87
 
88
  # ---------------- ENERGY CALC ----------------
89
- time_seconds = 40 * 0.04 # 1.6 sec
90
- energy = (data.mean * time_seconds) / 3600 # Wh
91
 
92
  # ---------------- STORE IN SUPABASE ----------------
93
  supabase.table("energy_logs").insert({
@@ -102,6 +103,7 @@ def predict(data: Features):
102
  "peak_count": data.peak_count,
103
  "slope": data.slope,
104
  "energy": energy
 
105
  }).execute()
106
 
107
  return {
 
32
  range: float
33
  peak_count: int
34
  slope: float
35
+ power: float
36
 
37
  # ---------------- FEATURE ENGINEERING ----------------
38
  def transform_features(data: Features):
 
87
  appliance = "Unknown"
88
 
89
  # ---------------- ENERGY CALC ----------------
90
+ time_seconds = 40 * 0.04 # 40 samples × 40ms = 1.6 sec
91
+ energy = (data.power * time_seconds) / 3600.0
92
 
93
  # ---------------- STORE IN SUPABASE ----------------
94
  supabase.table("energy_logs").insert({
 
103
  "peak_count": data.peak_count,
104
  "slope": data.slope,
105
  "energy": energy
106
+ "power": data.power
107
  }).execute()
108
 
109
  return {