taxforge 0.9.20__py3-none-any.whl → 0.9.22__py3-none-any.whl

aitax/__init__.py

@@ -1,3 +1,3 @@
 """TaxForge - AI-powered tax preparation"""
 
-__version__ = "0.9.20"
+__version__ = "0.9.22"

aitax/aitax.py

@@ -6,10 +6,32 @@ from .state import TaxAppState
 from .components import (
     COLORS, fintech_card, mercury_card, gradient_button, outline_button, stat_card,
     section_header, empty_state, badge, data_row, document_card,
-    nav_bar, page_container, api_key_modal,
+    nav_bar, page_container, api_key_modal, processing_overlay,
 )
 
 
+# ============== Styled Input Helper ==============
+def styled_input(placeholder: str, value, on_change, input_type: str = "text", width: str = "100%") -> rx.Component:
+    """Styled input with fintech theme."""
+    return rx.input(
+        placeholder=placeholder,
+        value=value,
+        on_change=on_change,
+        type=input_type,
+        width=width,
+        background="white",
+        border=f"1px solid {COLORS['border']}",
+        color=COLORS["text_primary"],
+        _placeholder={"color": COLORS["text_muted"]},
+        padding="10px 12px",
+        border_radius="8px",
+        _focus={
+            "border_color": COLORS["accent_primary"], 
+            "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"
+        },
+    )
+
+
 # ============== Upload Zone (Compact) ==============
 def upload_zone_compact() -> rx.Component:
     """Compact file upload dropzone."""
@@ -463,6 +485,13 @@ def review_page() -> rx.Component:
     """Review and edit tax data page."""
     return page_container(
         api_modal(),
+        # Processing overlay - shows full screen modal during AI processing
+        processing_overlay(
+            is_processing=TaxAppState.processing,
+            current_file=TaxAppState.processing_current_file,
+            file_index=TaxAppState.processing_file_index,
+            total_files=TaxAppState.processing_total_files,
+        ),
         rx.vstack(
             # Header
             rx.hstack(
@@ -503,67 +532,97 @@ def review_page() -> rx.Component:
                         ),
                         rx.divider(border_color=COLORS["border"]),
                         
-                        # File list with checkboxes
+                        # File list with checkboxes - ENTIRE ROW CLICKABLE
                         rx.foreach(
                             TaxAppState.parsed_documents,
-                            lambda doc: rx.hstack(
-                                rx.cond(
-                                    doc["status"] == "parsed",
-                                    rx.icon("circle-check", size=18, color=COLORS["success"]),
-                                    rx.checkbox(
-                                        checked=TaxAppState.selected_files.contains(doc["name"]),
-                                        on_change=lambda: TaxAppState.toggle_file_selection(doc["name"]),
-                                        disabled=doc["status"] == "processing",
+                            lambda doc: rx.box(
+                                rx.hstack(
+                                    rx.cond(
+                                        doc["status"] == "parsed",
+                                        rx.icon("circle-check", size=18, color=COLORS["success"]),
+                                        rx.box(
+                                            rx.cond(
+                                                TaxAppState.selected_files.contains(doc["name"]),
+                                                rx.icon("square-check", size=20, color=COLORS["accent_primary"]),
+                                                rx.icon("square", size=20, color=COLORS["text_muted"]),
+                                            ),
+                                        ),
                                     ),
-                                ),
-                                rx.vstack(
-                                    rx.text(doc["name"], color=COLORS["text_primary"], font_size="14px"),
-                                    rx.text(
-                                        rx.cond(
-                                            doc["status"] == "parsed",
-                                            f"✓ Processed - {doc['type']}",
+                                    rx.vstack(
+                                        rx.text(doc["name"], color=COLORS["text_primary"], font_size="14px"),
+                                        rx.text(
                                             rx.cond(
-                                                doc["status"] == "error",
-                                                "⚠ Error - click to retry",
+                                                doc["status"] == "parsed",
+                                                f"✓ Processed - {doc['type']}",
                                                 rx.cond(
-                                                    doc["status"] == "processing",
-                                                    "⏳ Processing...",
-                                                    f"Pending - {doc['type']}",
+                                                    doc["status"] == "error",
+                                                    "⚠ Error - click to retry",
+                                                    rx.cond(
+                                                        doc["status"] == "processing",
+                                                        "⏳ Processing...",
+                                                        f"Pending - {doc['type']}",
+                                                    ),
                                                 ),
                                             ),
-                                        ),
-                                        color=rx.cond(
-                                            doc["status"] == "parsed",
-                                            COLORS["success"],
-                                            rx.cond(
-                                                doc["status"] == "error",
-                                                COLORS["warning"],
-                                                COLORS["text_muted"],
+                                            color=rx.cond(
+                                                doc["status"] == "parsed",
+                                                COLORS["success"],
+                                                rx.cond(
+                                                    doc["status"] == "error",
+                                                    COLORS["warning"],
+                                                    COLORS["text_muted"],
+                                                ),
                                             ),
+                                            font_size="12px",
                                         ),
-                                        font_size="12px",
+                                        align_items="start",
+                                        spacing="0",
+                                        flex="1",
                                     ),
-                                    align_items="start",
-                                    spacing="0",
-                                    flex="1",
-                                ),
-                                rx.icon(
-                                    "x",
-                                    size=16,
-                                    color=COLORS["text_muted"],
-                                    cursor="pointer",
-                                    _hover={"color": COLORS["error"]},
-                                    on_click=lambda: TaxAppState.remove_file(doc["name"]),
+                                    rx.box(
+                                        rx.icon(
+                                            "x",
+                                            size=16,
+                                            color=COLORS["text_muted"],
+                                            _hover={"color": COLORS["error"]},
+                                        ),
+                                        cursor="pointer",
+                                        padding="4px",
+                                        border_radius="4px",
+                                        _hover={"background": COLORS["error_light"]},
+                                        on_click=lambda: TaxAppState.remove_file(doc["name"]),
+                                    ),
+                                    width="100%",
+                                    spacing="3",
                                 ),
-                                width="100%",
-                                padding="10px 12px",
+                                padding="12px 16px",
                                 background=rx.cond(
                                     doc["status"] == "parsed",
                                     COLORS["success_light"],
-                                    COLORS["bg_hover"],
+                                    rx.cond(
+                                        TaxAppState.selected_files.contains(doc["name"]),
+                                        "#EEF2FF",  # Light indigo when selected
+                                        COLORS["bg_hover"],
+                                    ),
                                 ),
                                 border_radius="8px",
-                                spacing="3",
+                                border=rx.cond(
+                                    TaxAppState.selected_files.contains(doc["name"]),
+                                    f"2px solid {COLORS['accent_primary']}",
+                                    "2px solid transparent",
+                                ),
+                                cursor=rx.cond(doc["status"] == "parsed", "default", "pointer"),
+                                _hover=rx.cond(
+                                    doc["status"] != "parsed",
+                                    {"background": "#E8EDFF"},
+                                    {},
+                                ),
+                                on_click=rx.cond(
+                                    doc["status"] != "parsed",
+                                    lambda: TaxAppState.toggle_file_selection(doc["name"]),
+                                    lambda: None,
+                                ),
+                                transition="all 0.15s ease",
                             ),
                         ),
                         
@@ -677,16 +736,54 @@ def review_page() -> rx.Component:
                         ),
                         rx.cond(
                             TaxAppState.rental_properties.length() > 0,
-                            rx.foreach(
-                                TaxAppState.rental_properties,
-                                lambda p, idx: rx.hstack(
-                                    rx.text(p["address"], flex="1"),
-                                    rx.text(f"Net: ${p['net_income']:,.2f}", 
-                                            color=rx.cond(p["net_income"].to(float) >= 0, COLORS["success"], COLORS["error"])),
-                                    rx.icon("x", size=14, cursor="pointer",
-                                            on_click=lambda: TaxAppState.remove_rental_property(idx)),
-                                    width="100%", padding="8px",
+                            rx.vstack(
+                                rx.foreach(
+                                    TaxAppState.rental_properties,
+                                    lambda p, idx: rx.box(
+                                        rx.hstack(
+                                            rx.vstack(
+                                                rx.text(p["address"], color=COLORS["text_primary"], font_weight="600", font_size="15px"),
+                                                rx.hstack(
+                                                    rx.text(f"Rent: ${p['monthly_rent']:,.0f}/mo", color=COLORS["accent_primary"], font_size="13px"),
+                                                    rx.text("→", color=COLORS["text_muted"], font_size="13px"),
+                                                    rx.text(f"${p['rent_income']:,.0f}/yr", color=COLORS["success"], font_size="13px", font_weight="500"),
+                                                    spacing="1",
+                                                ),
+                                                rx.text(f"Expenses: ${p['total_expenses']:,.0f}/yr", 
+                                                        color=COLORS["text_muted"], font_size="12px"),
+                                                align_items="start",
+                                                spacing="1",
+                                                flex="1",
+                                            ),
+                                            rx.vstack(
+                                                rx.text("Net Income", color=COLORS["text_muted"], font_size="11px"),
+                                                rx.text(f"${p['net_income']:,.0f}", 
+                                                        color=rx.cond(p["net_income"].to(float) >= 0, COLORS["success"], COLORS["error"]),
+                                                        font_weight="700",
+                                                        font_size="18px"),
+                                                rx.text("/year", color=COLORS["text_muted"], font_size="11px"),
+                                                align_items="center",
+                                                spacing="0",
+                                            ),
+                                            rx.box(
+                                                rx.icon("x", size=16, color=COLORS["text_muted"]),
+                                                cursor="pointer",
+                                                padding="6px",
+                                                border_radius="6px",
+                                                _hover={"background": COLORS["error_light"], "color": COLORS["error"]},
+                                                on_click=lambda: TaxAppState.remove_rental_property(idx),
+                                            ),
+                                            width="100%", spacing="4", align_items="center",
+                                        ),
+                                        padding="16px",
+                                        background="white", 
+                                        border_radius="10px", 
+                                        border=f"1px solid {COLORS['border']}",
+                                        box_shadow="0 1px 3px rgba(0,0,0,0.08)",
+                                    ),
                                 ),
+                                spacing="3",
+                                width="100%",
                             ),
                             rx.text("No rental properties added", color=COLORS["text_muted"], font_style="italic"),
                         ),
@@ -694,30 +791,130 @@ def review_page() -> rx.Component:
                         rx.cond(
                             TaxAppState.show_rental_form,
                             rx.vstack(
-                                rx.input(placeholder="Address", value=TaxAppState.rental_form_address, on_change=TaxAppState.set_rental_address, width="100%"),
+                                rx.input(
+                                    placeholder="Address", 
+                                    value=TaxAppState.rental_form_address, 
+                                    on_change=TaxAppState.set_rental_address, 
+                                    width="100%",
+                                    background="white",
+                                    border=f"1px solid {COLORS['border']}",
+                                    color=COLORS["text_primary"],
+                                    _placeholder={"color": COLORS["text_muted"]},
+                                    padding="10px 12px",
+                                    border_radius="8px",
+                                    _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
+                                ),
                                 rx.hstack(
-                                    rx.input(placeholder="Rent Income", value=TaxAppState.rental_form_income, on_change=TaxAppState.set_rental_income, type="number"),
-                                    rx.input(placeholder="Mortgage Int", value=TaxAppState.rental_form_mortgage, on_change=TaxAppState.set_rental_mortgage, type="number"),
+                                    rx.input(
+                                        placeholder="Monthly Rent ($)", 
+                                        value=TaxAppState.rental_form_income, 
+                                        on_change=TaxAppState.set_rental_income, 
+                                        type="number",
+                                        background="white",
+                                        border=f"1px solid {COLORS['border']}",
+                                        color=COLORS["text_primary"],
+                                        _placeholder={"color": COLORS["text_muted"]},
+                                        padding="10px 12px",
+                                        border_radius="8px",
+                                        _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
+                                    ),
+                                    rx.input(
+                                        placeholder="Mortgage Interest ($)", 
+                                        value=TaxAppState.rental_form_mortgage, 
+                                        on_change=TaxAppState.set_rental_mortgage, 
+                                        type="number",
+                                        background="white",
+                                        border=f"1px solid {COLORS['border']}",
+                                        color=COLORS["text_primary"],
+                                        _placeholder={"color": COLORS["text_muted"]},
+                                        padding="10px 12px",
+                                        border_radius="8px",
+                                        _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
+                                    ),
                                     width="100%",
+                                    spacing="3",
                                 ),
                                 rx.hstack(
-                                    rx.input(placeholder="Property Tax", value=TaxAppState.rental_form_tax, on_change=TaxAppState.set_rental_tax, type="number"),
-                                    rx.input(placeholder="Insurance", value=TaxAppState.rental_form_insurance, on_change=TaxAppState.set_rental_insurance, type="number"),
+                                    rx.input(
+                                        placeholder="Property Tax (Quarterly $)", 
+                                        value=TaxAppState.rental_form_tax, 
+                                        on_change=TaxAppState.set_rental_tax, 
+                                        type="number",
+                                        background="white",
+                                        border=f"1px solid {COLORS['border']}",
+                                        color=COLORS["text_primary"],
+                                        _placeholder={"color": COLORS["text_muted"]},
+                                        padding="10px 12px",
+                                        border_radius="8px",
+                                        _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
+                                    ),
+                                    rx.input(
+                                        placeholder="Insurance ($)", 
+                                        value=TaxAppState.rental_form_insurance, 
+                                        on_change=TaxAppState.set_rental_insurance, 
+                                        type="number",
+                                        background="white",
+                                        border=f"1px solid {COLORS['border']}",
+                                        color=COLORS["text_primary"],
+                                        _placeholder={"color": COLORS["text_muted"]},
+                                        padding="10px 12px",
+                                        border_radius="8px",
+                                        _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
+                                    ),
                                     width="100%",
+                                    spacing="3",
                                 ),
                                 rx.hstack(
-                                    rx.input(placeholder="Repairs", value=TaxAppState.rental_form_repairs, on_change=TaxAppState.set_rental_repairs, type="number"),
-                                    rx.input(placeholder="Depreciation", value=TaxAppState.rental_form_depreciation, on_change=TaxAppState.set_rental_depreciation, type="number"),
+                                    rx.input(
+                                        placeholder="Repairs ($)", 
+                                        value=TaxAppState.rental_form_repairs, 
+                                        on_change=TaxAppState.set_rental_repairs, 
+                                        type="number",
+                                        background="white",
+                                        border=f"1px solid {COLORS['border']}",
+                                        color=COLORS["text_primary"],
+                                        _placeholder={"color": COLORS["text_muted"]},
+                                        padding="10px 12px",
+                                        border_radius="8px",
+                                        _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
+                                    ),
+                                    rx.input(
+                                        placeholder="Depreciation ($)", 
+                                        value=TaxAppState.rental_form_depreciation, 
+                                        on_change=TaxAppState.set_rental_depreciation, 
+                                        type="number",
+                                        background="white",
+                                        border=f"1px solid {COLORS['border']}",
+                                        color=COLORS["text_primary"],
+                                        _placeholder={"color": COLORS["text_muted"]},
+                                        padding="10px 12px",
+                                        border_radius="8px",
+                                        _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
+                                    ),
                                     width="100%",
+                                    spacing="3",
+                                ),
+                                rx.input(
+                                    placeholder="Other Expenses ($)", 
+                                    value=TaxAppState.rental_form_other, 
+                                    on_change=TaxAppState.set_rental_other, 
+                                    type="number", 
+                                    width="100%",
+                                    background="white",
+                                    border=f"1px solid {COLORS['border']}",
+                                    color=COLORS["text_primary"],
+                                    _placeholder={"color": COLORS["text_muted"]},
+                                    padding="10px 12px",
+                                    border_radius="8px",
+                                    _focus={"border_color": COLORS["accent_primary"], "box_shadow": f"0 0 0 3px {COLORS['accent_light']}"},
                                 ),
-                                rx.input(placeholder="Other Expenses", value=TaxAppState.rental_form_other, on_change=TaxAppState.set_rental_other, type="number", width="100%"),
                                 rx.hstack(
                                     rx.button("Cancel", variant="outline", on_click=TaxAppState.toggle_rental_form),
                                     rx.button("Add Property", on_click=TaxAppState.submit_rental_form),
-                                    width="100%", justify="end",
+                                    width="100%", justify="end", spacing="3",
                                 ),
-                                width="100%", spacing="2", padding="12px", 
-                                background="white", border_radius="8px", border=f"1px solid {COLORS['border']}",
+                                width="100%", spacing="3", padding="16px", 
+                                background=COLORS["bg_page"], border_radius="8px", border=f"1px solid {COLORS['border']}",
                             ),
                         ),
                         rx.text(f"Total Rental Income: ${TaxAppState.total_rental_income:,.2f}", 
@@ -753,19 +950,20 @@ def review_page() -> rx.Component:
                         rx.cond(
                             TaxAppState.show_business_form,
                             rx.vstack(
-                                rx.input(placeholder="Business Name", value=TaxAppState.business_form_name, on_change=TaxAppState.set_business_name, width="100%"),
+                                styled_input("Business Name", TaxAppState.business_form_name, TaxAppState.set_business_name),
                                 rx.hstack(
-                                    rx.input(placeholder="Gross Income", value=TaxAppState.business_form_income, on_change=TaxAppState.set_business_income, type="number"),
-                                    rx.input(placeholder="Total Expenses", value=TaxAppState.business_form_expenses, on_change=TaxAppState.set_business_expenses, type="number"),
+                                    styled_input("Gross Income ($)", TaxAppState.business_form_income, TaxAppState.set_business_income, "number"),
+                                    styled_input("Total Expenses ($)", TaxAppState.business_form_expenses, TaxAppState.set_business_expenses, "number"),
                                     width="100%",
+                                    spacing="3",
                                 ),
                                 rx.hstack(
                                     rx.button("Cancel", variant="outline", on_click=TaxAppState.toggle_business_form),
                                     rx.button("Add Business", on_click=TaxAppState.submit_business_form),
-                                    width="100%", justify="end",
+                                    width="100%", justify="end", spacing="3",
                                 ),
-                                width="100%", spacing="2", padding="12px", 
-                                background="white", border_radius="8px", border=f"1px solid {COLORS['border']}",
+                                width="100%", spacing="3", padding="16px", 
+                                background=COLORS["bg_page"], border_radius="8px", border=f"1px solid {COLORS['border']}",
                             ),
                         ),
                         rx.text(f"Total Business Income: ${TaxAppState.total_business_income:,.2f}", 
@@ -803,10 +1001,12 @@ def review_page() -> rx.Component:
                         rx.cond(
                             TaxAppState.show_other_income_form,
                             rx.hstack(
-                                rx.input(placeholder="Description", value=TaxAppState.other_income_form_desc, on_change=TaxAppState.set_other_income_desc, flex="1"),
-                                rx.input(placeholder="Amount", value=TaxAppState.other_income_form_amount, on_change=TaxAppState.set_other_income_amount, type="number", width="120px"),
+                                styled_input("Description", TaxAppState.other_income_form_desc, TaxAppState.set_other_income_desc),
+                                styled_input("Amount ($)", TaxAppState.other_income_form_amount, TaxAppState.set_other_income_amount, "number", "140px"),
                                 rx.button("Add", on_click=TaxAppState.submit_other_income_form),
                                 width="100%",
+                                spacing="3",
+                                padding="8px 0",
                             ),
                         ),
                         width="100%", spacing="2", padding="12px", 
@@ -837,10 +1037,12 @@ def review_page() -> rx.Component:
                         rx.cond(
                             TaxAppState.show_other_deduction_form,
                             rx.hstack(
-                                rx.input(placeholder="Description", value=TaxAppState.other_deduction_form_desc, on_change=TaxAppState.set_other_deduction_desc, flex="1"),
-                                rx.input(placeholder="Amount", value=TaxAppState.other_deduction_form_amount, on_change=TaxAppState.set_other_deduction_amount, type="number", width="120px"),
+                                styled_input("Description", TaxAppState.other_deduction_form_desc, TaxAppState.set_other_deduction_desc),
+                                styled_input("Amount ($)", TaxAppState.other_deduction_form_amount, TaxAppState.set_other_deduction_amount, "number", "140px"),
                                 rx.button("Add", on_click=TaxAppState.submit_other_deduction_form),
                                 width="100%",
+                                spacing="3",
+                                padding="8px 0",
                             ),
                         ),
                         width="100%", spacing="2", padding="12px", 
@@ -877,20 +1079,21 @@ def review_page() -> rx.Component:
                             TaxAppState.show_dependent_form,
                             rx.vstack(
                                 rx.hstack(
-                                    rx.input(placeholder="Name", value=TaxAppState.dependent_form_name, on_change=TaxAppState.set_dependent_name, flex="1"),
-                                    rx.input(placeholder="Relationship", value=TaxAppState.dependent_form_relationship, on_change=TaxAppState.set_dependent_relationship, width="120px"),
-                                    rx.input(placeholder="Age", value=TaxAppState.dependent_form_age, on_change=TaxAppState.set_dependent_age, type="number", width="80px"),
+                                    styled_input("Name", TaxAppState.dependent_form_name, TaxAppState.set_dependent_name),
+                                    styled_input("Relationship", TaxAppState.dependent_form_relationship, TaxAppState.set_dependent_relationship, "text", "140px"),
+                                    styled_input("Age", TaxAppState.dependent_form_age, TaxAppState.set_dependent_age, "number", "80px"),
                                     width="100%",
+                                    spacing="3",
                                 ),
                                 rx.text("Under 17 = $2,000 Child Tax Credit | 17+ = $500 Other Dependent Credit", 
                                         color=COLORS["text_muted"], font_size="12px"),
                                 rx.hstack(
                                     rx.button("Cancel", variant="outline", on_click=TaxAppState.toggle_dependent_form),
                                     rx.button("Add Dependent", on_click=TaxAppState.submit_dependent_form),
-                                    width="100%", justify="end",
+                                    width="100%", justify="end", spacing="3",
                                 ),
-                                width="100%", spacing="2", padding="12px", 
-                                background="white", border_radius="8px", border=f"1px solid {COLORS['border']}",
+                                width="100%", spacing="3", padding="16px", 
+                                background=COLORS["bg_page"], border_radius="8px", border=f"1px solid {COLORS['border']}",
                             ),
                         ),
                         # Credits Summary
@@ -1309,7 +1512,7 @@ app = rx.App(
 )
 
 # Register pages
-app.add_page(dashboard_page, route="/", title="TaxForge - Dashboard")
+app.add_page(dashboard_page, route="/", title="TaxForge - Dashboard", on_load=TaxAppState.load_saved_data)
 app.add_page(upload_page, route="/upload", title="TaxForge - Upload")
 app.add_page(review_page, route="/review", title="TaxForge - Review")
 app.add_page(settings_page, route="/settings", title="TaxForge - Settings")

aitax/cli.py

@@ -8,7 +8,7 @@ import shutil
 from pathlib import Path
 
 
-__version__ = "0.9.20"
+__version__ = "0.9.22"
 
 RXCONFIG_CONTENT = '''"""Reflex config for TaxForge."""
 import reflex as rx

aitax/components.py

@@ -562,3 +562,81 @@ def api_key_modal(is_open: bool, on_close: Callable, api_key_value: str,
             ),
         ),
     )
+
+
+def processing_overlay(
+    is_processing: bool,
+    current_file: str,
+    file_index: int,
+    total_files: int,
+) -> rx.Component:
+    """Full-screen processing overlay with progress."""
+    return rx.cond(
+        is_processing,
+        rx.box(
+            # Backdrop
+            rx.box(
+                position="fixed",
+                top="0",
+                left="0",
+                right="0",
+                bottom="0",
+                background="rgba(0, 0, 0, 0.5)",
+                z_index="300",
+            ),
+            # Modal
+            rx.box(
+                rx.vstack(
+                    rx.box(
+                        rx.spinner(size="3", color=COLORS["accent_primary"]),
+                        padding="16px",
+                        background=COLORS["accent_light"],
+                        border_radius="50%",
+                    ),
+                    rx.text("Processing Documents", 
+                            color=COLORS["text_primary"],
+                            font_size="20px", 
+                            font_weight="600"),
+                    rx.text(f"File {file_index} of {total_files}",
+                            color=COLORS["text_secondary"],
+                            font_size="14px"),
+                    rx.text(current_file,
+                            color=COLORS["accent_primary"],
+                            font_size="14px",
+                            font_weight="500",
+                            max_width="280px",
+                            overflow="hidden",
+                            text_overflow="ellipsis",
+                            white_space="nowrap"),
+                    rx.box(
+                        rx.progress(
+                            value=file_index,
+                            max=total_files,
+                            width="100%",
+                            color_scheme="indigo",
+                        ),
+                        width="100%",
+                        padding="8px 0",
+                    ),
+                    rx.text("Please wait while AI extracts data...",
+                            color=COLORS["text_muted"],
+                            font_size="13px"),
+                    spacing="3",
+                    align_items="center",
+                    width="100%",
+                ),
+                background="white",
+                border_radius="16px",
+                padding="32px",
+                box_shadow="0 25px 50px -12px rgba(0, 0, 0, 0.25)",
+                position="fixed",
+                top="50%",
+                left="50%",
+                transform="translate(-50%, -50%)",
+                z_index="301",
+                width="90%",
+                max_width="360px",
+                text_align="center",
+            ),
+        ),
+    )

aitax/document_extractor.py

@@ -10,9 +10,11 @@ from pathlib import Path
 from typing import Optional
 
 # Rate limiting settings
-MAX_RETRIES = 3
-RETRY_DELAY_SECONDS = 5
-REQUEST_DELAY_SECONDS = 2  # Delay between requests to avoid rate limiting
+# Gemini free tier: 15 RPM (requests per minute) = 1 request per 4 seconds
+# Being conservative with 5 seconds to avoid hitting limits
+MAX_RETRIES = 5
+RETRY_DELAY_SECONDS = 10  # Initial retry delay (will exponentially backoff)
+REQUEST_DELAY_SECONDS = 5  # Delay between requests to avoid rate limiting
 
 
 # Prompt to extract tax document data
@@ -36,12 +38,13 @@ For 1099-INT forms, extract:
 - interest_income: Box 1 - Interest income
 - federal_withheld: Box 4 - Federal income tax withheld
 
-For 1099-DIV forms, extract:
-- payer_name: Institution name
-- ordinary_dividends: Box 1a - Total ordinary dividends
+For 1099-DIV forms (Dividend Income), extract:
+- payer_name: Institution/broker name (e.g., Fidelity, Schwab, Vanguard)
+- ordinary_dividends: Box 1a - Total ordinary dividends (THIS IS THE MAIN AMOUNT - look for it carefully!)
 - qualified_dividends: Box 1b - Qualified dividends
 - capital_gain: Box 2a - Total capital gain distributions
 - federal_withheld: Box 4 - Federal income tax withheld
+NOTE: On consolidated 1099s, dividend info may be labeled "1099-DIV" in a section. Look for dollar amounts next to Box 1a.
 
 For 1099-B forms, extract:
 - payer_name: Broker name
@@ -268,28 +271,47 @@ async def extract_with_retry(
     api_key: Optional[str] = None,
 ) -> dict:
     """
-    Extract with automatic retry on rate limiting.
+    Extract with automatic retry on rate limiting and transient errors.
     """
+    last_result = None
+    
     for attempt in range(MAX_RETRIES):
         result = await extract_from_document(file_path, api_key)
+        last_result = result
+        
+        error = result.get("error", "")
+        
+        # Check for retryable errors
+        is_rate_limited = error == "RATE_LIMITED"
+        is_transient = any(x in str(error).lower() for x in [
+            "rate", "quota", "limit", "429", "500", "502", "503", "504",
+            "timeout", "overloaded", "capacity", "try again"
+        ])
         
-        if result.get("error") == "RATE_LIMITED":
+        if is_rate_limited or is_transient:
             if attempt < MAX_RETRIES - 1:
                 # Wait and retry with exponential backoff
                 wait_time = RETRY_DELAY_SECONDS * (2 ** attempt)
+                print(f"[TaxForge] Rate limited, waiting {wait_time}s before retry {attempt + 2}/{MAX_RETRIES}...")
                 await asyncio.sleep(wait_time)
                 continue
             else:
                 return {
-                    "error": "API quota exceeded after retries. Please wait a minute and try again.",
+                    "error": f"API quota exceeded after {MAX_RETRIES} retries. Please wait a minute and try again.",
                     "document_type": "UNKNOWN",
                     "confidence": 0.0,
                     "extracted_data": {}
                 }
         
+        # Non-retryable error or success
         return result
     
-    return result
+    return last_result or {
+        "error": "Max retries exceeded",
+        "document_type": "UNKNOWN",
+        "confidence": 0.0,
+        "extracted_data": {}
+    }
 
 
 def convert_to_w2(extracted_data: dict) -> dict:
@@ -304,17 +326,32 @@ def convert_to_w2(extracted_data: dict) -> dict:
 def convert_to_1099(extracted_data: dict, form_type: str) -> dict:
     """Convert extracted data to 1099 format for state."""
     amount = 0.0
+    
     if form_type == "1099-INT":
-        amount = float(extracted_data.get("interest_income", 0))
+        # Try multiple field names that LLM might use
+        amount = float(extracted_data.get("interest_income", 0) or 
+                      extracted_data.get("interest", 0) or
+                      extracted_data.get("box_1", 0) or
+                      extracted_data.get("taxable_interest", 0) or 0)
     elif form_type == "1099-DIV":
-        amount = float(extracted_data.get("ordinary_dividends", 0))
+        # Try multiple field names that LLM might use
+        amount = float(extracted_data.get("ordinary_dividends", 0) or 
+                      extracted_data.get("total_ordinary_dividends", 0) or
+                      extracted_data.get("dividends", 0) or
+                      extracted_data.get("box_1a", 0) or
+                      extracted_data.get("total_dividends", 0) or 0)
     elif form_type == "1099-B":
-        amount = float(extracted_data.get("gain_loss", extracted_data.get("proceeds", 0)))
+        # Try multiple field names
+        amount = float(extracted_data.get("gain_loss", 0) or 
+                      extracted_data.get("net_gain_loss", 0) or
+                      extracted_data.get("proceeds", 0) or
+                      extracted_data.get("total_proceeds", 0) or 0)
     
     return {
-        "payer_name": extracted_data.get("payer_name", extracted_data.get("lender_name", "Unknown Payer")),
+        "payer_name": extracted_data.get("payer_name", extracted_data.get("lender_name", extracted_data.get("institution", "Unknown Payer"))),
         "amount": amount,
         "form_type": form_type,
+        "raw_data": extracted_data,  # Keep raw for debugging
     }
 
 

aitax/persistence.py

@@ -0,0 +1,197 @@
+"""
+TaxForge - Data Persistence
+Save and load tax data to/from local JSON file.
+"""
+import json
+import os
+from pathlib import Path
+from typing import Dict, Any, Optional
+from datetime import datetime
+import base64
+import hashlib
+
+# Data directory
+DATA_DIR = Path.home() / ".taxforge"
+DATA_FILE = DATA_DIR / "tax_data.json"
+BACKUP_DIR = DATA_DIR / "backups"
+
+# Fields to persist (from TaxAppState)
+PERSIST_FIELDS = [
+    # Personal info
+    "first_name", "last_name", "filing_status",
+    # API key (will be obfuscated)
+    "openai_api_key",
+    # Documents
+    "uploaded_files", "parsed_documents",
+    # Tax data
+    "w2_list", "form_1099_list", "form_1098_list", "form_5498_list",
+    # Manual entries
+    "rental_properties", "business_income", "other_income", "other_deductions",
+    "dependents", "child_care_expenses",
+    # Calculated values we want to persist
+    "total_wages", "total_interest", "total_dividends", "total_capital_gains",
+    "total_rental_income", "total_business_income", "total_other_income",
+    "hsa_deduction", "self_employment_tax", "mortgage_interest_deduction",
+    "adjusted_gross_income", "itemized_deductions", "standard_deduction",
+    "total_deductions", "taxable_income", "total_tax", "total_withholding",
+    "other_withholding", "refund_or_owed", "is_refund",
+    "child_tax_credit", "other_dependent_credit", "child_care_credit", "total_credits",
+    # Status
+    "return_status", "return_generated",
+]
+
+# Fields that should be obfuscated (not encrypted, just not plain text)
+SENSITIVE_FIELDS = ["openai_api_key"]
+
+
+def _obfuscate(value: str) -> str:
+    """Simple obfuscation for sensitive values (not real encryption)."""
+    if not value:
+        return ""
+    return base64.b64encode(value.encode()).decode()
+
+
+def _deobfuscate(value: str) -> str:
+    """Reverse obfuscation."""
+    if not value:
+        return ""
+    try:
+        return base64.b64decode(value.encode()).decode()
+    except:
+        return value  # Return as-is if can't decode
+
+
+def ensure_data_dir():
+    """Ensure data directory exists."""
+    DATA_DIR.mkdir(parents=True, exist_ok=True)
+    BACKUP_DIR.mkdir(parents=True, exist_ok=True)
+
+
+def save_state(state) -> bool:
+    """
+    Save state to JSON file.
+    
+    Args:
+        state: TaxAppState instance
+        
+    Returns:
+        True if successful, False otherwise
+    """
+    try:
+        ensure_data_dir()
+        
+        # Extract fields to save
+        data = {
+            "_saved_at": datetime.now().isoformat(),
+            "_version": "0.9.21",
+        }
+        
+        for field in PERSIST_FIELDS:
+            if hasattr(state, field):
+                value = getattr(state, field)
+                # Handle special types
+                if isinstance(value, (list, dict)):
+                    data[field] = value
+                else:
+                    data[field] = value
+                    
+                # Obfuscate sensitive fields
+                if field in SENSITIVE_FIELDS and value:
+                    data[field] = _obfuscate(str(value))
+        
+        # Create backup of existing file
+        if DATA_FILE.exists():
+            backup_name = f"tax_data_{datetime.now().strftime('%Y%m%d_%H%M%S')}.json"
+            backup_path = BACKUP_DIR / backup_name
+            # Keep only last 5 backups
+            existing_backups = sorted(BACKUP_DIR.glob("tax_data_*.json"))
+            if len(existing_backups) >= 5:
+                for old_backup in existing_backups[:-4]:
+                    old_backup.unlink()
+        
+        # Write to file
+        with open(DATA_FILE, 'w') as f:
+            json.dump(data, f, indent=2, default=str)
+        
+        return True
+        
+    except Exception as e:
+        print(f"[TaxForge] Error saving state: {e}")
+        return False
+
+
+def load_state(state) -> bool:
+    """
+    Load state from JSON file.
+    
+    Args:
+        state: TaxAppState instance to populate
+        
+    Returns:
+        True if data was loaded, False if no data or error
+    """
+    try:
+        if not DATA_FILE.exists():
+            print("[TaxForge] No saved data found, starting fresh")
+            return False
+        
+        with open(DATA_FILE, 'r') as f:
+            data = json.load(f)
+        
+        print(f"[TaxForge] Loading saved data from {data.get('_saved_at', 'unknown')}")
+        
+        # Restore fields
+        for field in PERSIST_FIELDS:
+            if field in data:
+                value = data[field]
+                
+                # Deobfuscate sensitive fields
+                if field in SENSITIVE_FIELDS and value:
+                    value = _deobfuscate(value)
+                
+                # Set the attribute
+                if hasattr(state, field):
+                    setattr(state, field, value)
+        
+        print(f"[TaxForge] Loaded: {len(data.get('w2_list', []))} W-2s, "
+              f"{len(data.get('form_1099_list', []))} 1099s, "
+              f"{len(data.get('rental_properties', []))} rentals")
+        
+        return True
+        
+    except Exception as e:
+        print(f"[TaxForge] Error loading state: {e}")
+        return False
+
+
+def clear_saved_data() -> bool:
+    """Clear all saved data."""
+    try:
+        if DATA_FILE.exists():
+            DATA_FILE.unlink()
+        return True
+    except Exception as e:
+        print(f"[TaxForge] Error clearing data: {e}")
+        return False
+
+
+def get_data_info() -> Dict[str, Any]:
+    """Get info about saved data."""
+    info = {
+        "exists": DATA_FILE.exists(),
+        "path": str(DATA_FILE),
+        "size": 0,
+        "saved_at": None,
+    }
+    
+    if DATA_FILE.exists():
+        info["size"] = DATA_FILE.stat().st_size
+        try:
+            with open(DATA_FILE, 'r') as f:
+                data = json.load(f)
+                info["saved_at"] = data.get("_saved_at")
+                info["version"] = data.get("_version")
+        except:
+            pass
+    
+    return info

aitax/state.py

@@ -15,6 +15,7 @@ from .document_extractor import (
     convert_1099_misc_to_other_income,
     REQUEST_DELAY_SECONDS
 )
+from .persistence import save_state, load_state, clear_saved_data
 import asyncio
 
 
@@ -269,6 +270,7 @@ class TaxAppState(rx.State):
         self.openai_api_key = self.temp_api_key
         self.show_api_modal = False
         self.success_message = "API key saved!"
+        self._auto_save()  # Persist API key
     
     def check_api_key_for_upload(self):
         """Check if API key is set, open modal if not."""
@@ -328,6 +330,7 @@ class TaxAppState(rx.State):
             if new_files > 0:
                 self.success_message = f"Uploaded {new_files} file(s). Go to Review to process with AI."
                 self.return_status = "in_progress"
+                self._auto_save()  # Persist uploaded files list
         except Exception as e:
             self.error_message = f"Upload failed: {str(e)}"
     
@@ -573,15 +576,18 @@ class TaxAppState(rx.State):
                            mortgage_interest: float = 0, property_tax: float = 0,
                            insurance: float = 0, repairs: float = 0, 
                            management: float = 0, utilities: float = 0,
-                           depreciation: float = 0, other_expenses: float = 0):
-        """Add a rental property (Schedule E)."""
+                           depreciation: float = 0, other_expenses: float = 0,
+                           monthly_rent: float = 0, quarterly_tax: float = 0):
+        """Add a rental property (Schedule E). All values should be annual."""
         total_expenses = (mortgage_interest + property_tax + insurance + 
                          repairs + management + utilities + depreciation + other_expenses)
         self.rental_properties.append({
             "address": address,
-            "rent_income": rent_income,
+            "monthly_rent": monthly_rent,    # For display
+            "quarterly_tax": quarterly_tax,  # For display
+            "rent_income": rent_income,      # Annual (monthly × 12)
             "mortgage_interest": mortgage_interest,
-            "property_tax": property_tax,
+            "property_tax": property_tax,    # Annual (quarterly × 4)
             "insurance": insurance,
             "repairs": repairs,
             "management": management,
@@ -712,15 +718,25 @@ class TaxAppState(rx.State):
     def submit_rental_form(self):
         """Submit rental property form."""
         try:
+            # Monthly rent × 12 = Annual rent income
+            monthly_rent = float(self.rental_form_income or 0)
+            annual_rent = monthly_rent * 12
+            
+            # Quarterly property tax × 4 = Annual
+            quarterly_tax = float(self.rental_form_tax or 0)
+            annual_tax = quarterly_tax * 4
+            
             self.add_rental_property(
                 address=self.rental_form_address or "Property",
-                rent_income=float(self.rental_form_income or 0),
+                rent_income=annual_rent,
                 mortgage_interest=float(self.rental_form_mortgage or 0),
-                property_tax=float(self.rental_form_tax or 0),
+                property_tax=annual_tax,
                 insurance=float(self.rental_form_insurance or 0),
                 repairs=float(self.rental_form_repairs or 0),
                 depreciation=float(self.rental_form_depreciation or 0),
                 other_expenses=float(self.rental_form_other or 0),
+                monthly_rent=monthly_rent,  # Store for display
+                quarterly_tax=quarterly_tax,  # Store for display
             )
             # Clear form
             self.rental_form_address = ""
@@ -1073,6 +1089,16 @@ class TaxAppState(rx.State):
         
         if self.total_wages > 0 or total_income > 0:
             self.return_status = "in_progress"
+        
+        # Auto-save after recalculation
+        self._auto_save()
+    
+    def _auto_save(self):
+        """Auto-save state to disk."""
+        try:
+            save_state(self)
+        except Exception as e:
+            print(f"[TaxForge] Auto-save failed: {e}")
     
     def _calculate_tax(self, income: float, brackets: list) -> float:
         """Calculate tax from brackets."""
@@ -1140,6 +1166,15 @@ class TaxAppState(rx.State):
         self.return_generated = False
         self.error_message = ""
         self.success_message = ""
+        # Also clear persisted data
+        clear_saved_data()
+    
+    def load_saved_data(self):
+        """Load previously saved data from disk."""
+        if load_state(self):
+            self.success_message = "Previous session restored!"
+        else:
+            self.success_message = ""
     
     # ===== Computed Properties =====
     @rx.var

{taxforge-0.9.20.dist-info → taxforge-0.9.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taxforge
-Version: 0.9.20
+Version: 0.9.22
 Summary: AI-powered tax preparation assistant
 Author: TaxForge Team
 License: MIT

taxforge-0.9.22.dist-info/RECORD

@@ -0,0 +1,12 @@
+aitax/__init__.py,sha256=nyfwdgcJkm0IZZxEUPth1pyolrF5U_FCMcunvZ63w6k,68
+aitax/aitax.py,sha256=6XY7MM5iKMh9PWpjajIwh5fDMR-zjLGXBn8Vjk9w9ZY,75937
+aitax/cli.py,sha256=rTFcb_CCd0cM_KJjolruBk_2aH0k8MJrnRpyowkBEFE,2651
+aitax/components.py,sha256=p3MQgKQr95zmO5Uu-jcgCBApuULoV_AD2SZvAGGT0dw,23855
+aitax/document_extractor.py,sha256=k1mEXNp5nxM7jSLi7_okZuElu6PItrKL7K2yHRpOc6c,16130
+aitax/persistence.py,sha256=m9Bel2wrgDaduNQyRxyfXRYEsw_z_83xc2oK2I94FXI,5932
+aitax/state.py,sha256=D85kA3mcUUP7YuDARfstTPjSPilVv2HAKDYD3K2jIAI,47234
+taxforge-0.9.22.dist-info/METADATA,sha256=_DcfKQ9V9ze5feHr8D2bla7pEPoSbgGkfsDInYLBIDA,4874
+taxforge-0.9.22.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+taxforge-0.9.22.dist-info/entry_points.txt,sha256=2dG4U_m3yvQaVeD8LeEGm1v8szyNGQtXUZOvbwH75Gg,44
+taxforge-0.9.22.dist-info/top_level.txt,sha256=H7DuLZSRzSwHT5STc7uQa0oTOsKcNYUz2Pn4a4C5Q0Y,6
+taxforge-0.9.22.dist-info/RECORD,,

taxforge-0.9.20.dist-info/RECORD

@@ -1,11 +0,0 @@
-aitax/__init__.py,sha256=hV9XKDmqYNgMHDYg2q_S1YEwZ4owPZh93d_XtJ8_PVM,68
-aitax/aitax.py,sha256=l0lSEz81q8A2__gpmmIFvn-8eol1cSFU8QQzhNtrbcU,63645
-aitax/cli.py,sha256=dm3M-sQ506Q5_hJRh_fOeosPF-ufY43BT46AeeOUwJU,2651
-aitax/components.py,sha256=pi4wKOtNsw0ju1cN3ivY7UWF0Q32rshijeklFnxVt5U,21056
-aitax/document_extractor.py,sha256=gArprV9JkIXCUsjUdbmbBobcAIzhHPZMcpUY4VKcGtA,14104
-aitax/state.py,sha256=vr5hlK2Dv3a4fhMntK6NUTnQdBjILpewoWGaq8DRQAw,45779
-taxforge-0.9.20.dist-info/METADATA,sha256=YGHJYtiUf7B6d7v8TBUo3gmCaoxOlknUkdJhSbdeFOg,4874
-taxforge-0.9.20.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-taxforge-0.9.20.dist-info/entry_points.txt,sha256=2dG4U_m3yvQaVeD8LeEGm1v8szyNGQtXUZOvbwH75Gg,44
-taxforge-0.9.20.dist-info/top_level.txt,sha256=H7DuLZSRzSwHT5STc7uQa0oTOsKcNYUz2Pn4a4C5Q0Y,6
-taxforge-0.9.20.dist-info/RECORD,,