Update app.py

app.py

@@ -250,6 +250,80 @@ def compute_housing_per_acre(cost: float, acres: float) -> float:
     # Housing = 0.5% of cost, allocated per acre
     return 0.005 * float(cost) / max(float(acres), 1e-9)
 
+# Blackbord helpers
+# ---------- Blackboard helpers ----------
+def _fmt_money(x): 
+    return f"${x:,.2f}"
+
+def _fmt_pct(x): 
+    return f"{x*100:.1f}%"
+
+def explain_repair(equip, cost, life, acres, speed, frac, hours, per_ac_yr):
+    # Iowa method: AccumHours = life * (acres / speed)   and Repair$/ac/yr = (Cost × AccumRepairFraction) / (life × acres)
+    # Sources: Repair method & per-year/per-acre basis in course notes. 
+    src = "Iowa table (Accumulated Repair Fraction) — see class notes."
+    return (
+        "REPAIR — show your work\n"
+        f"1) Accumulated hours:  hours = life × (acres / speed) = {life:g} × ({acres:g} / {speed:g}) = {hours:,.1f} hr.\n"
+        f"2) Table lookup: fraction = {frac:.4f} ({_fmt_pct(frac)})  ← {src}\n"
+        f"3) Total lifetime repair $:  Cost × fraction = {_fmt_money(cost)} × {frac:.4f} = {_fmt_money(cost*frac)}.\n"
+        f"4) Per-acre-per-year:  lifetime_repair ÷ (life × acres) = {_fmt_money(cost*frac)} ÷ ({life:g} × {acres:g}) = {_fmt_money(per_ac_yr)} per ac/yr."
+    )
+
+def explain_fuel(hp, diesel, speed, per_ac):
+    # Fuel Cost per ac = (0.044 × PTO HP × Diesel $/gal) / speed_acph
+    # Reference: fuel formula in notes.
+    return (
+        "FUEL — show your work\n"
+        f"Fuel$/ac = (0.044 × PTO_HP × diesel_price) ÷ speed\n"
+        f"          = (0.044 × {hp:g} × {_fmt_money(diesel)}/gal) ÷ {speed:g}\n"
+        f"          = {_fmt_money(per_ac)} per ac."
+    )
+
+def explain_lube(fuel_per_ac, lube_per_ac):
+    # Lube = 0.15 × Fuel (Iowa)
+    return (
+        "LUBE — show your work\n"
+        f"Lube$/ac = 0.15 × Fuel$/ac = 0.15 × {_fmt_money(fuel_per_ac)} = {_fmt_money(lube_per_ac)} per ac."
+    )
+
+def explain_labor(wage, speed, per_ac):
+    # Labor$/ac = wage / speed
+    return (
+        "LABOR — show your work\n"
+        f"Labor$/ac = wage ÷ speed = {_fmt_money(wage)} ÷ {speed:g} = {_fmt_money(per_ac)} per ac."
+    )
+
+def explain_depr(cost, salvage_frac, salvage, life, acres, per_ac_yr):
+    # Dep$/ac/yr = (C − S) / (life × acres)
+    return (
+        "DEPRECIATION — show your work\n"
+        f"1) Salvage fraction from table = {salvage_frac:.3f} ({_fmt_pct(salvage_frac)}); Salvage S = {_fmt_money(salvage)}.\n"
+        f"2) Dep$/ac/yr = (C − S) ÷ (life × acres) = ({_fmt_money(cost)} − {_fmt_money(salvage)}) ÷ ({life:g} × {acres:g})\n"
+        f"               = {_fmt_money(per_ac_yr)} per ac/yr."
+    )
+
+def explain_occ(cost, salvage, rate, acres, per_ac_yr):
+    # OCC$/ac/yr = rate × ((C + S)/2) ÷ acres   (no division by life)
+    avg_inv = 0.5*(cost+salvage)
+    return (
+        "OPPORTUNITY COST OF CAPITAL — show your work\n"
+        f"Avg investment = (C + S)/2 = ({_fmt_money(cost)} + {_fmt_money(salvage)}) / 2 = {_fmt_money(avg_inv)}.\n"
+        f"OCC$/ac/yr = rate × AvgInvestment ÷ acres = {rate:.3f} × {_fmt_money(avg_inv)} ÷ {acres:g}\n"
+        f"           = {_fmt_money(per_ac_yr)} per ac/yr."
+    )
+
+def explain_tax_ins_housing(kind, cost, per_ac):
+    # Tax=1% of cost; Insurance=0.5%; Housing=0.5%   (annual) then ÷ acres for per-acre basis
+    rates = {"tax":0.01, "insurance":0.005, "housing":0.005}
+    r = rates[kind]
+    label = {"tax":"TAX","insurance":"INSURANCE","housing":"HOUSING"}[kind]
+    return (
+        f"{label} — show your work\n"
+        f"{label}$/ac/yr = ({r:.3f} × Cost) ÷ acres = ({r:.3f} × {_fmt_money(cost)}) ÷ acres = {_fmt_money(per_ac)} per ac/yr."
+    )
+
+
 
 # ---- Keyword intent + Regex fallback ----
 NUM=r"[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?"
@@ -545,13 +619,28 @@ with gr.Blocks(css="footer {visibility: hidden}") as demo:
             gr.Markdown("### Student HUD — what Jerry sees")
             hud_box = gr.Textbox(label="Final Data (persists this session)", lines=18, value=_pp({k: None for k in HUD_FIELDS}))
             changed_box = gr.Textbox(label="Fields updated by last prompt", lines=3, value="(none)")
-
+    
+    # NEW: a Blackboard textbox (under your teacher accordion or right below out)
+    #blackboard = gr.Textbox(label="Blackboard — step-by-step", lines=14)
+    steps_box = gr.Textbox(label="Blackboard — show the work", lines=16, value="(none)")
+    
     # Optional: teacher debug accordion if you kept the teacher JSON earlier
     # (If you added a teacher debug already, you can leave this out or keep your version.)
     with gr.Accordion("Teacher debug — Parser & JSON (optional)", open=False):
         dbg = gr.Textbox(label="LLM/Regex + Raw/Final JSON + Diagnostics", lines=22)
 
     def _ask_with_hud(user_text, hud):
+        """
+        Returns SIX values in this order:
+        1) student answer (string)
+        2) HUD JSON (string)
+        3) changed fields (string)
+        4) teacher debug JSON (string)
+        5) new HUD state (dict)
+        6) blackboard/steps text (string)
+        """
+        steps_text = "(none)"  # Blackboard default
+
         # ---- Parse (LLM first, then regex) ----
         raw_llm = llm_parse(user_text)
         if raw_llm:
@@ -596,69 +685,154 @@ with gr.Blocks(css="footer {visibility: hidden}") as demo:
         rate   = new_hud.get("rate")
         if rate is not None:
             rate = float(rate)
-            if rate > 1.0: rate = rate / 100.0  # accept 8 or 8% as 0.08
+            if rate > 1.0: rate = rate / 100.0
         else:
             rate = 0.08
 
-        # ---- Readiness check for chosen cost ----
+        # ---- If no which_cost, early return (SIX outputs) ----
         if not which:
             msg = "Jerry → Tell me which cost (e.g., fuel, repair, depreciation). Check the HUD to see what I have so far."
             teacher_dbg = _pp({"mode": mode, "raw_llm": raw_llm, "raw_regex": raw_regex, "final_data": new_hud})
-            return msg, _pp(new_hud), ", ".join(changed) or "(none)", teacher_dbg, new_hud
+            return msg, _pp(new_hud), ", ".join(changed) or "(none)", teacher_dbg, new_hud, steps_text
 
+        # ---- Check readiness for chosen cost; early return if missing (SIX outputs) ----
         missing = missing_for(which, new_hud)
         if missing:
             msg = f"Jerry → Not enough data for {which}. Missing: {', '.join(missing)}. Check the HUD and add what's missing."
             teacher_dbg = _pp({"mode": mode, "raw_llm": raw_llm, "raw_regex": raw_regex, "final_data": new_hud, "missing": missing})
-            return msg, _pp(new_hud), ", ".join(changed) or "(none)", teacher_dbg, new_hud
-
-        # ---- Compute (now that HUD is complete for this cost) ----
-        salv_frac, salvage, salvage_class = salvage_parts(equip, cost, hp, acres, speed, life)
+            return msg, _pp(new_hud), ", ".join(changed) or "(none)", teacher_dbg, new_hud, steps_text
+
+        # ---- Derived diagnostics for Blackboard (safe) ----
+        # salvage parts (works whether salvage_parts exists or not)
+        def _safe_salvage_parts(equip, cost, hp, acres, speed, life):
+            try:
+                # try the convenience helper if present in your file
+                return salvage_parts(equip, cost, hp, acres, speed, life)  # (frac, salvage, class)
+            except Exception:
+                # fallback to the earlier direct computation
+                try:
+                    machine_class = classify_machine_for_salvage(equip, hp)
+                except Exception:
+                    machine_class = None
+                try:
+                    annual_hours = float(acres)/max(float(speed), 1e-9)
+                except Exception:
+                    annual_hours = 0.0
+                try:
+                    salv_frac = get_salvage_fraction(machine_class, annual_hours, float(life)) if machine_class else None
+                except Exception:
+                    salv_frac = None
+                if salv_frac is None:
+                    salv_frac = 0.20
+                return float(salv_frac), float(cost)*float(salv_frac), machine_class or equip
+
+        salv_frac, salvage, salvage_class = _safe_salvage_parts(equip, cost, hp, acres, speed, life)
+
+        # ---- Compute chosen cost + Blackboard text ----
         if which == "repair_per_acre_year":
             r = compute_repair_per_acre_year(equip, cost, life, acres, speed)
             ans = f"Jerry → REPAIR per acre-year: fraction={r['fraction']:.3f}, value=${r['repair_per_acre_year']:.2f}/ac/yr (mode={mode})"
+            # Blackboard
+            try:
+                steps_text = explain_repair(
+                    equip=equip, cost=cost, life=life, acres=acres, speed=speed,
+                    frac=r["fraction"], hours=r["hours"], per_ac_yr=r["repair_per_acre_year"]
+                )
+            except Exception:
+                steps_text = "(repair: explanation unavailable)"
+
         elif which == "fuel_per_acre":
             f = compute_fuel_per_acre(hp, diesel, speed)
             ans = f"Jerry → FUEL per acre=${f:.2f} (mode={mode})"
+            try:
+                steps_text = explain_fuel(hp=hp, diesel=diesel, speed=speed, per_ac=f)
+            except Exception:
+                steps_text = "(fuel: explanation unavailable)"
+
         elif which == "lube_per_acre":
             f = compute_fuel_per_acre(hp, diesel, speed)
             l = compute_lube_per_acre(f)
             ans = f"Jerry → LUBE per acre=${l:.2f} (mode={mode})"
+            try:
+                steps_text = explain_lube(fuel_per_ac=f, lube_per_ac=l)
+            except Exception:
+                steps_text = "(lube: explanation unavailable)"
+
         elif which == "labor_per_acre":
             l = compute_labor_per_acre(wage, speed)
             ans = f"Jerry → LABOR per acre=${l:.2f} (mode={mode})"
-        
+            try:
+                steps_text = explain_labor(wage=wage, speed=speed, per_ac=l)
+            except Exception:
+                steps_text = "(labor: explanation unavailable)"
+
         elif which == "depreciation_per_acre_year":
             d = compute_depr_per_acre_year(cost, salvage, life, acres)
-            ans = (
-                f"Jerry → DEPRECIATION per acre-year=${d:.2f} "
-                f"(salvage fraction={salv_frac:.2f}, salvage=${salvage:,.0f}; mode={mode})"
-            )
+            ans = f"Jerry → DEPRECIATION per acre-year=${d:.2f} (salvage fraction={salv_frac:.2f}, salvage=${salvage:,.0f}; mode={mode})"
+            try:
+                steps_text = explain_depr(cost=cost, salvage_frac=salv_frac, salvage=salvage, life=life, acres=acres, per_ac_yr=d)
+            except Exception:
+                steps_text = "(depreciation: explanation unavailable)"
+
         elif which == "occ_per_acre_year":
             o = compute_occ_per_acre_year(cost, salvage, rate, life, acres)
-            ans = (
-                f"Jerry → OCC per acre-year=${o:.2f} "
-                f"(salvage fraction={salv_frac:.2f}, salvage=${salvage:,.0f}; mode={mode})"
-            )
+            ans = f"Jerry → OCC per acre-year=${o:.2f} (salvage fraction={salv_frac:.2f}, salvage=${salvage:,.0f}; mode={mode})"
+            try:
+                steps_text = explain_occ(cost=cost, salvage=salvage, rate=rate, acres=acres, per_ac_yr=o)
+            except Exception:
+                steps_text = "(OCC: explanation unavailable)"
+
         elif which == "tax":
-            tval = compute_tax_per_acre(cost, acres)
-            ans = f"Jerry → TAX per acre=${tval:.2f} (mode={mode})"
+            t = compute_tax_per_acre(cost, acres)
+            ans = f"Jerry → TAX per acre-year=${t:.2f} (mode={mode})"
+            try:
+                steps_text = explain_tax_ins_housing("tax", cost, t)
+            except Exception:
+                steps_text = "(tax: explanation unavailable)"
+
         elif which == "insurance":
-           ival = compute_insurance_per_acre(cost, acres)
-           ans = f"Jerry → INSURANCE per acre=${ival:.2f} (mode={mode})"
+            ins = compute_insurance_per_acre(cost, acres)
+            ans = f"Jerry → INSURANCE per acre-year=${ins:.2f} (mode={mode})"
+            try:
+                steps_text = explain_tax_ins_housing("insurance", cost, ins)
+            except Exception:
+                steps_text = "(insurance: explanation unavailable)"
+
         elif which == "housing":
-           hval = compute_housing_per_acre(cost, acres)
-           ans = f"Jerry → HOUSING per acre=${hval:.2f} (mode={mode})"
+            h = compute_housing_per_acre(cost, acres)
+            ans = f"Jerry → HOUSING per acre-year=${h:.2f} (mode={mode})"
+            try:
+                steps_text = explain_tax_ins_housing("housing", cost, h)
+            except Exception:
+                steps_text = "(housing: explanation unavailable)"
+
+        else:
+            ans = f"Jerry → Unknown cost. (mode={mode})"
+            steps_text = "(none)"
+
         teacher_dbg = _pp({
             "mode": mode,
             "raw_llm": raw_llm,
             "raw_regex": raw_regex,
             "final_data": new_hud
         })
-        return ans, _pp(new_hud), ", ".join(changed) or "(none)", teacher_dbg, new_hud
-
+        return ans, _pp(new_hud), ", ".join(changed) or "(none)", teacher_dbg, new_hud, steps_text
+    
+    
     # Wire it up; we update 5 outputs: student answer, HUD JSON, changed fields, teacher debug, and the state
-    ask.click(_ask_with_hud, [q, hud_state], [out, hud_box, changed_box, dbg, hud_state])
+    #ask.click(_ask_with_hud, [q, hud_state], [out, hud_box, changed_box, dbg, hud_state])
+    ask.click(
+        _ask_with_hud,
+        [q, hud_state],                                  # <-- 2 inputs ONLY
+        [out, hud_box, changed_box, dbg, hud_state, steps_box]  # <-- 6 outputs
+    )
+
+
+    # add this after `changed_box` definition
+    # --- Blackboard (always on) ---
+    
+
+
 
 if __name__=="__main__":
     demo.queue().launch(server_name="0.0.0.0",server_port=int(os.getenv("PORT","7860")))