Update app.py

app.py

@@ -70,13 +70,11 @@ def _docx_to_table_and_text(fileobj) -> tuple[pd.DataFrame|None, str]:
     # try to find a depreciation table
     for t in doc.tables:
         rows = [[c.text.strip() for c in r.cells] for r in t.rows]
-        if not rows: 
+        if not rows:
             continue
         hdr = rows[0]
-        # minimal shape like your HW: Year | Begin BV | Depreciation | Accum | End BV
         if len(hdr) >= 4 and any("year" in _norm_name(h) for h in hdr):
             df = pd.DataFrame(rows[1:], columns=hdr)
-            # drop empty rows
             df = df[~(df.astype(str).apply(lambda r: "".join(r), axis=1).str.strip() == "")]
             if not df.empty:
                 return df, all_text
@@ -97,7 +95,6 @@ def _table_from_ocr_text(text: str) -> pd.DataFrame|None:
         return None
     lines = [ln.strip() for ln in text.splitlines() if ln.strip()]
 
-    # Strict header (your class format)
     hdr_i = -1
     for i, ln in enumerate(lines):
         low = ln.lower()
@@ -105,7 +102,6 @@ def _table_from_ocr_text(text: str) -> pd.DataFrame|None:
             hdr_i = i
             break
     if hdr_i == -1:
-        # looser: split by >=2 spaces or tabs, header row must have >=4 cols
         for i, ln in enumerate(lines):
             parts = re.split(r"\s{2,}|\t+", ln)
             low = ln.lower()
@@ -122,7 +118,6 @@ def _table_from_ocr_text(text: str) -> pd.DataFrame|None:
         if len(parts) == len(header):
             data.append(parts)
         else:
-            # stop at first badly formatted line after we’ve started reading data
             if len(data) >= 1:
                 break
     if not data:
@@ -144,17 +139,14 @@ def _normalize_depr_columns(df_in: pd.DataFrame) -> pd.DataFrame:
     out["Accum Dep"] = df[c_acc] if c_acc else pd.NA
     out["End BV"] = df[c_end] if c_end else pd.NA
 
-    # numeric coerce for values except year (year also coerced)
     out["Year"] = pd.to_numeric(out["Year"], errors="coerce")
     for col in ["Begin BV","Depreciation","Accum Dep","End BV"]:
         out[col] = out[col].map(_coerce_numeric)
-    # drop empty rows
     out = out[~out[["Begin BV","Depreciation","Accum Dep","End BV"]].isna().all(axis=1)].reset_index(drop=True)
     return out
 
 # Monday Aug 11 New helpers
 def build_sl_schedule(cost: float, salvage: float, life: int, start_year: int):
-    """Return the straight-line depreciation schedule as a DataFrame."""
     dep = (cost - salvage) / life
     years = [start_year + i for i in range(life)]
     begin_bv, dep_col, accum, end_bv = [], [], [], []
@@ -179,10 +171,8 @@ def build_sl_schedule(cost: float, salvage: float, life: int, start_year: int):
     return out
 
 def audit_against_expected(expected: pd.DataFrame, actual: pd.DataFrame):
-    """Row-by-row deltas (actual - expected). Assumes normalized col names."""
     if actual is None or actual.empty:
         return pd.DataFrame(), "No student table found to check."
-    # align only overlapping years
     merged = expected.merge(
         actual[["Year","Begin BV","Depreciation","Accum Dep","End BV"]],
         on="Year", how="inner", suffixes=("_exp","_act")
@@ -192,7 +182,6 @@ def audit_against_expected(expected: pd.DataFrame, actual: pd.DataFrame):
     deltas = pd.DataFrame({"Year": merged["Year"]})
     for c in ["Begin BV","Depreciation","Accum Dep","End BV"]:
         deltas[c + " Δ"] = merged[f"{c}_act"] - merged[f"{c}_exp"]
-    # first mismatch helper
     first_bad = None
     for _, r in deltas.iterrows():
         if any(abs(r[col]) > 1e-6 for col in deltas.columns if col.endswith("Δ")):
@@ -205,8 +194,6 @@ def audit_against_expected(expected: pd.DataFrame, actual: pd.DataFrame):
     )
     return deltas, msg
 
-
-
 # ---------- Gradio callbacks ----------
 def _params_tuple(p):
     p = p or {}
@@ -219,9 +206,7 @@ def _params_tuple(p):
 
 def handle_docx(file):
     if file is None:
-        # header, params_json, norm_df, cost, salv, life, year, state_params, state_table
         return "(no file)", {}, pd.DataFrame(), 0.0, 0.0, 10, pd.Timestamp.now().year, {}, pd.DataFrame()
-
     df_raw, header = _docx_to_table_and_text(file.name if hasattr(file, "name") else file)
     params = _extract_params(header or "")
     df_norm = _normalize_depr_columns(df_raw) if df_raw is not None else None
@@ -230,7 +215,7 @@ def handle_docx(file):
         header or "(no text found)",
         params,
         (df_norm if df_norm is not None else pd.DataFrame()),
-        cost, salv, life, year,     # ⬅ push directly to the inputs
+        cost, salv, life, year,
         params,
         (df_norm if df_norm is not None else pd.DataFrame()),
     )
@@ -250,36 +235,47 @@ def handle_image(img):
         params,
         df_raw,
         (df_norm if df_norm is not None else pd.DataFrame()),
-        cost, salv, life, year,     # ⬅ push directly to the inputs
+        cost, salv, life, year,
         params,
         (df_norm if df_norm is not None else pd.DataFrame()),
     )
 
+def fill_from_state(p):
+    p = p or {}
+    return (
+        float(p.get("cost", 0.0)),
+        float(p.get("salvage", 0.0)),
+        int(p.get("life", 10)),
+        int(p.get("start_year", pd.Timestamp.now().year)),
+    )
+
+def build_cb(cost, salv, life, year):
+    try:
+        df = build_sl_schedule(float(cost), float(salv), int(life), int(year))
+    except Exception as e:
+        return pd.DataFrame([{"error": str(e)}])
+    return df
+
+def check_cb(cost, salv, life, year, table):
+    exp = build_sl_schedule(float(cost), float(salv), int(life), int(year))
+    deltas, msg = audit_against_expected(exp, table if isinstance(table, pd.DataFrame) else pd.DataFrame())
+    return deltas, msg
 
 # ---------- UI ----------
 with gr.Blocks(title="Jerry • HW Intake (Echo)") as demo:
     last_params = gr.State({})
     last_table  = gr.State(pd.DataFrame())
     gr.Markdown("## Jerry (TA) – Homework Intake\nThis Space **only reads and echoes** your files.\nNext step will add solving & coaching.")
+
+    # --- Tab 1: DOCX ---
     with gr.Tab("Upload .docx"):
         docx_in = gr.File(file_types=[".docx"], label="Homework .docx")
         btn1 = gr.Button("Read")
         header_txt = gr.Textbox(label="Header/Text (for params)", lines=8)
         params_json = gr.JSON(label="Detected parameters")
         table_df = gr.Dataframe(label="Detected table (normalized)", interactive=False)
-        btn1.click(
-            handle_docx,
-            inputs=docx_in,
-            outputs=[
-                header_txt,        # text
-                params_json,       # json
-                table_df,          # norm table visible in tab 1
-                in_cost, in_salv, in_life, in_year,   # ⬅ autofill the four inputs
-                last_params,       # state
-                last_table,        # state
-            ],
-        )
 
+    # --- Tab 2: Image ---
     with gr.Tab("Upload Image (.png/.jpg)"):
         img_in = gr.Image(type="pil", label="Photo or screenshot of your table")
         btn2 = gr.Button("OCR")
@@ -287,20 +283,8 @@ with gr.Blocks(title="Jerry • HW Intake (Echo)") as demo:
         params_json2 = gr.JSON(label="Detected parameters")
         raw_df = gr.Dataframe(label="Raw table guess", interactive=False)
         norm_df = gr.Dataframe(label="Detected table (normalized)", interactive=False)
-        btn2.click(
-            handle_image,
-            inputs=img_in,
-            outputs=[
-                ocr_txt,           # raw OCR text
-                params_json2,      # json
-                raw_df,            # raw table
-                norm_df,           # norm table visible in tab 2
-                in_cost, in_salv, in_life, in_year,   # ⬅ autofill the four inputs
-                last_params,       # state
-                last_table,        # state
-            ],
-        )
 
+    # --- Tab 3: Solve & Check ---
     with gr.Tab("Straight-Line • Solve & Check"):
         gr.Markdown("Enter params (auto-filled if detected) → build the correct SL schedule → compare to your uploaded table.")
         with gr.Row():
@@ -308,67 +292,46 @@ with gr.Blocks(title="Jerry • HW Intake (Echo)") as demo:
             in_salv = gr.Number(label="Salvage", value=0.0)
             in_life = gr.Number(label="Life (years)", value=10, precision=0)
             in_year = gr.Number(label="Start year", value=2025, precision=0)
-        # added here
-        btn_use = gr.Button("Use detected params")
-
-        def fill_from_state(p):
-            p = p or {}
-            return (
-                float(p.get("cost", 0.0)),
-                float(p.get("salvage", 0.0)),
-                int(p.get("life", 10)),
-                int(p.get("start_year", pd.Timestamp.now().year)),
-            )
-
-        btn_use.click(fill_from_state, inputs=last_params,
-                      outputs=[in_cost, in_salv, in_life, in_year])
 
+        btn_use = gr.Button("Use detected params")
         btn_build = gr.Button("Build expected schedule")
         expected_df = gr.Dataframe(label="Expected (SL) schedule", interactive=False)
         btn_check = gr.Button("Check against uploaded table")
         deltas_df  = gr.Dataframe(label="Differences (student − expected)", interactive=False)
         coach_txt  = gr.Markdown()
 
-        def fill_from_state(p):
-            # prefill controls when we have parsed params
-            p = p or {}
-            return (
-                p.get("cost", 0.0),
-                p.get("salvage", 0.0),
-                p.get("life", 10),
-                p.get("start_year", pd.Timestamp.now().year),
-            )
-
-        def build_cb(cost, salv, life, year):
-            try:
-                df = build_sl_schedule(float(cost), float(salv), int(life), int(year))
-            except Exception as e:
-                return pd.DataFrame([{"error": str(e)}])
-            return df
-
-        def check_cb(cost, salv, life, year, table):
-            exp = build_sl_schedule(float(cost), float(salv), int(life), int(year))
-            deltas, msg = audit_against_expected(exp, table if isinstance(table, pd.DataFrame) else pd.DataFrame())
-            return deltas, msg
-
-        # Wire up
-        btn_build.click(build_cb, [in_cost, in_salv, in_life, in_year], [expected_df])
-        btn_check.click(check_cb, [in_cost, in_salv, in_life, in_year, last_table], [deltas_df, coach_txt])
-   
-        
-
-     
-        
-
-    
-    # Auto-fill inputs whenever we parse new params
-    def prefill_inputs(p): return fill_from_state(p)
-
+    # ---------- Wire events AFTER all components exist ----------
+    btn1.click(
+        handle_docx,
+        inputs=docx_in,
+        outputs=[
+            header_txt,        # text
+            params_json,       # json
+            table_df,          # normalized table (tab 1)
+            in_cost, in_salv, in_life, in_year,   # autofill inputs
+            last_params,       # state
+            last_table,        # state
+        ],
+    )
 
-    
+    btn2.click(
+        handle_image,
+        inputs=img_in,
+        outputs=[
+            ocr_txt,           # raw OCR text
+            params_json2,      # json
+            raw_df,            # raw table
+            norm_df,           # normalized table (tab 2)
+            in_cost, in_salv, in_life, in_year,   # autofill inputs
+            last_params,       # state
+            last_table,        # state
+        ],
+    )
 
+    btn_use.click(fill_from_state, inputs=last_params, outputs=[in_cost, in_salv, in_life, in_year])
+    btn_build.click(build_cb, [in_cost, in_salv, in_life, in_year], [expected_df])
+    btn_check.click(check_cb, [in_cost, in_salv, in_life, in_year, last_table], [deltas_df, coach_txt])
 
-    
     gr.Markdown("— Echo mode finished. When this looks good, we’ll plug in the SL solver + coaching.")
 
 if __name__ == "__main__":