Update app.py

app.py

@@ -208,24 +208,52 @@ def audit_against_expected(expected: pd.DataFrame, actual: pd.DataFrame):
 
 
 # ---------- Gradio callbacks ----------
+def _params_tuple(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 handle_docx(file):
     if file is None:
-        return "(no file)", None, None, {}, pd.DataFrame()
+        # 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
-    return header or "(no text found)", params, df_norm, params, (df_norm if df_norm is not None else pd.DataFrame())
+    cost, salv, life, year = _params_tuple(params)
+    return (
+        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
+        params,
+        (df_norm if df_norm is not None else pd.DataFrame()),
+    )
 
 def handle_image(img):
     if img is None:
-        return "(no image)", None, None, None, {}, pd.DataFrame()
+        return "(no image)", {}, None, pd.DataFrame(), 0.0, 0.0, 10, pd.Timestamp.now().year, {}, pd.DataFrame()
     from PIL import Image as PILImage
     pil = img if isinstance(img, PILImage.Image) else PILImage.fromarray(img)
     ocr_text = _image_to_text(pil)
     params = _extract_params(ocr_text or "")
     df_raw = _table_from_ocr_text(ocr_text or "")
     df_norm = _normalize_depr_columns(df_raw) if df_raw is not None else None
-    return ocr_text or "(empty OCR)", params, df_raw, df_norm, params, (df_norm if df_norm is not None else pd.DataFrame())
+    cost, salv, life, year = _params_tuple(params)
+    return (
+        ocr_text or "(empty OCR)",
+        params,
+        df_raw,
+        (df_norm if df_norm is not None else pd.DataFrame()),
+        cost, salv, life, year,     # ⬅ push directly to the inputs
+        params,
+        (df_norm if df_norm is not None else pd.DataFrame()),
+    )
 
 
 # ---------- UI ----------
@@ -239,7 +267,18 @@ with gr.Blocks(title="Jerry • HW Intake (Echo)") as demo:
         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, params_json, table_df])
+        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
+            ],
+        )
 
     with gr.Tab("Upload Image (.png/.jpg)"):
         img_in = gr.Image(type="pil", label="Photo or screenshot of your table")
@@ -248,7 +287,19 @@ 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, params_json2, raw_df, norm_df])
+        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
+            ],
+        )
 
     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.")
@@ -314,11 +365,7 @@ with gr.Blocks(title="Jerry • HW Intake (Echo)") as demo:
     def prefill_inputs(p): return fill_from_state(p)
 
 
-    last_params.change(
-        fn=lambda p: fill_from_state(p),
-        inputs=last_params,
-        outputs=[in_cost, in_salv, in_life, in_year]
-    )
+