Update app.py

app.py

@@ -430,93 +430,73 @@ def render_parse_panel(parse, completed, show_vat=True):
 
 def decide_fiscal(text, issuer_status, parse, explicit_doc_choice,
                   clarify_vat_basis=None, clarify_client_tax_id=None):
-    """
-    Returns (issuer_dict, final_parse, questions_dict) where:
-      - issuer_dict: ready for core.complete()
-      - final_parse: enriched parse ready for core.complete()
-      - questions_dict: {field: question_text} for any remaining mandatory gaps
-    """
-    questions = {}
+    """Returns (issuer_dict, final_parse, questions_dict)."""
     today = _today()
 
-    # ── 1. Issuer ────────────────────────────────────────────────────────────
+    # ── 1. Issuer required first — no model run needed if missing ────────────
     if not issuer_status:
-        questions["issuer_status"] = "מי אתה? בחר סטטוס מנפיק למעלה (עוסק פטור / עוסק מורשה)."
+        return None, None, {"issuer_status": "בחר סטטוס מנפיק למעלה (עוסק פטור / עוסק מורשה)."}
+
+    questions = {}
     exempt = (issuer_status == "פטור")
     issuer = {**DEMO_ISSUER_BASE,
               "status": "exempt_dealer" if exempt else "authorized_dealer",
               "is_company": False}
 
-    # ── 2. Mandatory content fields ──────────────────────────────────────────
+    # ── 2. Mandatory content ──────────────────────────────────────────────────
     if not parse.get("client_name", "").strip():
         questions["client_name"] = "שם הלקוח / המשלם?"
     if not parse.get("items"):
         questions["items"] = "מה השירות/המוצר ובאיזה סכום? (למשל: ייעוץ עסקי ₪500)"
 
-    # ── 3. Date: extract from text → today ───────────────────────────────────
-    detected_date = _detect_date_from_text(text) or today.isoformat()
+    # ── 3. Date ───────────────────────────────────────────────────────────────
     parse = dict(parse)
-    parse.setdefault("date", detected_date)
+    parse.setdefault("date", _detect_date_from_text(text) or today.isoformat())
 
-    # ── 4. Doc type decision ─────────────────────────────────────────────────
-    is_gross = _text_has(text, _GROSS_PATTERNS) or clarify_vat_basis == "כולל מע״מ"
-    is_net   = _text_has(text, _NET_PATTERNS)   or clarify_vat_basis == "לפני מע״מ"
+    # ── 4. Doc type + VAT basis ───────────────────────────────────────────────
+    is_gross    = _text_has(text, _GROSS_PATTERNS) or clarify_vat_basis == "כולל מע״מ"
+    is_net      = _text_has(text, _NET_PATTERNS)   or clarify_vat_basis == "לפני מע״מ"
     has_vat_cue = is_gross or is_net
 
     if exempt:
-        # עוסק פטור → always receipt, no VAT
-        doc_type     = "receipt"
-        amount_basis = "net"   # irrelevant (vat_rate = 0)
+        doc_type, amount_basis = "receipt", "net"
+
     elif explicit_doc_choice and explicit_doc_choice != "זיהוי אוטומטי":
-        doc_type = {
-            "קבלה": "receipt",
-            "חשבונית מס": "tax_invoice",
-            "חשבונית מס וקבלה": "tax_invoice_receipt",
-        }.get(explicit_doc_choice, "receipt")
-        # amount basis for tax-invoice types
+        doc_type = {"קבלה": "receipt", "חשבונית מס": "tax_invoice",
+                    "חשבונית מס וקבלה": "tax_invoice_receipt"}.get(explicit_doc_choice, "receipt")
         if doc_type != "receipt":
-            if is_gross:   amount_basis = "gross"
-            elif is_net:   amount_basis = "net"
-            elif clarify_vat_basis is None:
-                questions["vat_basis"] = (
-                    f"הסכום {'₪' + str(int(sum(i.get('unit_price',0)*i.get('quantity',1) for i in parse.get('items',[]))))+ ' ' if parse.get('items') else ''}—"
-                    f" **כולל מע״מ** או **לפני מע״מ**?")
-                amount_basis = "net"  # placeholder until answered
+            if is_gross:
+                amount_basis = "gross"
+            elif is_net:
+                amount_basis = "net"
+            elif clarify_vat_basis in (None, "לא צוין"):
+                total = sum(i.get("unit_price",0)*i.get("quantity",1) for i in parse.get("items",[]))
+                questions["vat_basis"] = f"הסכום (₪{total:,.0f}) — כולל מע״מ או לפני מע״מ?"
+                amount_basis = "net"
             else:
                 amount_basis = "net"
         else:
             amount_basis = "net"
     else:
-        # Auto mode
+        # Auto: VAT cue → tax_invoice_receipt; no cue → receipt (no VAT)
         if has_vat_cue:
-            doc_type     = "tax_invoice_receipt"
-            amount_basis = "gross" if is_gross else "net"
+            doc_type, amount_basis = "tax_invoice_receipt", "gross" if is_gross else "net"
         else:
-            # No VAT mention → receipt without VAT breakdown
-            doc_type     = "receipt"
-            amount_basis = "net"
-
-    # ── 5. Payment received vs. demanded ─────────────────────────────────────
-    # חשבונית מס (no קבלה) = money not yet received — explicit choice only
-    # Auto never produces pure tax_invoice (always /קבלה if VAT)
+            doc_type, amount_basis = "receipt", "net"
 
-    # ── 6. Client tax ID for allocation ──────────────────────────────────────
+    # ── 5. Allocation: ח.פ. only for בע"מ/חברה clients + large amounts ───────
     if doc_type in ("tax_invoice", "tax_invoice_receipt") and not exempt:
-        subtotal = sum(
-            it.get("unit_price", 0) * it.get("quantity", 1)
-            for it in parse.get("items", []))
-        threshold = core.allocation_threshold_for_date(
-            _dt.date.fromisoformat(parse["date"]))
-        client_biz = parse.get("client_is_business", False)
-        if client_biz and subtotal >= threshold and not parse.get("client_tax_id"):
-            if clarify_client_tax_id:
+        subtotal  = sum(it.get("unit_price",0)*it.get("quantity",1) for it in parse.get("items",[]))
+        threshold = core.allocation_threshold_for_date(_dt.date.fromisoformat(parse["date"]))
+        name      = parse.get("client_name", "")
+        is_corp   = any(kw in name for kw in ['בע"מ', "בעמ", "חברה", "בע'מ", "בע.מ"])
+        if is_corp and subtotal >= threshold:
+            if clarify_client_tax_id and clarify_client_tax_id.strip():
                 parse["client_tax_id"] = clarify_client_tax_id.strip()
-            else:
-                questions["client_tax_id"] = (
-                    f"ח.פ. הלקוח — נדרש למספר הקצאה (עסקה ≥ ₪{threshold:,})")
+            elif not parse.get("client_tax_id"):
+                questions["client_tax_id"] = f"ח.פ. הלקוח (נדרש להקצאה — עסקה ≥ ₪{threshold:,})"
 
-    parse["doc_type"]      = doc_type
-    parse["amount_basis"]  = amount_basis
+    parse.update({"doc_type": doc_type, "amount_basis": amount_basis})
     parse.setdefault("payment_method",     "bank_transfer")
     parse.setdefault("currency",           "ILS")
     parse.setdefault("client_tax_id",      None)
@@ -552,16 +532,19 @@ def _build_clarification_message(questions: dict, note_text: str) -> str:
 
 def generate(note, issuer_radio, doc_choice,
              clarify_vat, clarify_tax_id):
-    """
-    Single-shot, stateless pipeline. Returns:
-      (status_md, clarify_html, parse_html, doc_html, recs_html,
-       clarify_visible)
-    """
+    """Single-shot, stateless pipeline."""
     note = (note or "").strip()
     if not note:
         return ("✏️ כתוב פתק הכנסה ולחץ הפק מסמך.",
                 "", "", "", "", False)
 
+    issuer_status = issuer_radio if issuer_radio in ("פטור", "מורשה") else None
+
+    # ── Check issuer BEFORE running the model (saves 90s on CPU) ─────────────
+    if not issuer_status:
+        return ("👤 בחר תחילה: **עוסק פטור** או **עוסק מורשה** למעלה.",
+                "", "", "", "", False)
+
     _lazy_init()
     parse = model_parse(note)
 
@@ -570,10 +553,7 @@ def generate(note, issuer_radio, doc_choice,
                 "'קיבלתי 500₪ ממשה על ייעוץ'.",
                 "", "", "", "", False)
 
-    issuer_status = issuer_radio if issuer_radio in ("פטור", "מורשה") else None
-
-    # apply clarification answers from the note text itself
-    cvat = clarify_vat   if clarify_vat   != "לא צוין" else None
+    cvat = clarify_vat   if clarify_vat   not in (None, "לא צוין") else None
     ctax = clarify_tax_id.strip() if clarify_tax_id and clarify_tax_id.strip() else None
 
     issuer, final, questions = decide_fiscal(
@@ -581,14 +561,13 @@ def generate(note, issuer_radio, doc_choice,
 
     if questions:
         msg = _build_clarification_message(questions, note)
-        return (msg, "", "", "", "", True)   # show clarification fields
+        return (msg, "", "", "", "", True)
 
     try:
         completed = core.complete(issuer, final, _STATE["rng"])
     except Exception as e:
         return (f"⚠️ שגיאה: {e}", "", "", "", "", False)
 
-    # override VAT display for receipt (no breakdown)
     show_vat = (final["doc_type"] != "receipt")
 
     return ("✅ המסמך הופק בהצלחה.",
@@ -598,59 +577,6 @@ def generate(note, issuer_radio, doc_choice,
             render_recommendations(recommend(note)),
             False)
 
-    """'Behind the scenes' panel: what the MODEL extracted vs what the
-    DETERMINISTIC engine computed. Demonstrates the model/rules separation —
-    the model predicts only the extraction; all arithmetic is rule-based."""
-    items = parse.get("items", [])
-    item_rows = "".join(
-        f'<div style="display:flex;justify-content:space-between;font-size:12px;'
-        f'color:#334155;padding:3px 0;"><span>{it.get("description","")}</span>'
-        f'<span style="color:#64748b;">{it.get("quantity",1)} × ₪{it.get("unit_price",0):,.0f}</span></div>'
-        for it in items)
-
-    chips = (
-        f'<span style="background:#ecfdf5;color:#047857;border:1px solid #a7f3d0;'
-        f'border-radius:999px;padding:2px 9px;font-size:11px;">לקוח: {parse.get("client_name","—")}</span>'
-        f'<span style="background:#ecfdf5;color:#047857;border:1px solid #a7f3d0;'
-        f'border-radius:999px;padding:2px 9px;font-size:11px;">'
-        f'{"עסק" if parse.get("client_is_business") else "פרטי"}</span>'
-        f'<span style="background:#ecfdf5;color:#047857;border:1px solid #a7f3d0;'
-        f'border-radius:999px;padding:2px 9px;font-size:11px;">{len(items)} פריטים</span>')
-
-    alloc_line = ""
-    if completed.get("allocation_required"):
-        alloc_line = ('<div style="font-size:12px;color:#334155;padding:3px 0;">'
-                      'מספר הקצאה <span style="color:#0d9488;">✓ נדרש</span> '
-                      '(תנאי: חשבונית · עסק · ≥ סף)</div>')
-
-    return f"""
-<div dir="rtl" style="font-family:'Segoe UI',Arial,sans-serif;max-width:660px;
-     margin:14px auto 0;display:grid;grid-template-columns:1fr 1fr;gap:12px;">
-
-  <div style="background:#f8fafc;border:1px solid #e2e8f0;border-radius:12px;padding:14px 16px;">
-    <div style="font-size:11px;font-weight:700;color:#0d9488;letter-spacing:.05em;
-         text-transform:uppercase;margin-bottom:10px;">🧠 המודל חילץ</div>
-    <div style="display:flex;flex-wrap:wrap;gap:5px;margin-bottom:10px;">{chips}</div>
-    {item_rows}
-    <div style="font-size:10px;color:#94a3b8;margin-top:10px;border-top:1px dashed #e2e8f0;
-         padding-top:8px;">gemma-2-2b + LoRA · חוזה רק <code>parse</code></div>
-  </div>
-
-  <div style="background:#f8fafc;border:1px solid #e2e8f0;border-radius:12px;padding:14px 16px;">
-    <div style="font-size:11px;font-weight:700;color:#7c3aed;letter-spacing:.05em;
-         text-transform:uppercase;margin-bottom:10px;">⚙️ המנוע חישב</div>
-    <div style="font-size:12px;color:#334155;padding:3px 0;">מע"מ {int(round(completed.get("vat_rate",0)*100))}% ·
-      ₪{completed.get("vat_amount",0):,.2f}</div>
-    <div style="font-size:12px;color:#334155;padding:3px 0;">סה"כ ₪{completed.get("total",0):,.2f}</div>
-    <div style="font-size:12px;color:#334155;padding:3px 0;">מס׳ מסמך {completed.get("serial_number","")}</div>
-    {alloc_line}
-    <div style="font-size:10px;color:#94a3b8;margin-top:10px;border-top:1px dashed #e2e8f0;
-         padding-top:8px;">דטרמיניסטי · אפס הזיות בחשבון</div>
-  </div>
-</div>"""
-
-
-
 # ═════════════════════════════════════════════════════════════════════════════
 # 7. UI — Gradio 6.17 compatible, ChatGPT/Claude style
 # ═════════════════════════════════════════════════════════════════════════════