Upload 4 files

main.py

@@ -5,7 +5,7 @@ SQLite + SQLModel + FastAPI
 """
 
 from __future__ import annotations
-from typing import Optional, List
+from typing import Optional, List, Any
 from datetime import datetime, date
 import os
 import pathlib
@@ -137,7 +137,7 @@ class InvoiceItem(SQLModel, table=True):
     invoice: Optional[Invoice] = Relationship(back_populates="items")
 
 # --------------------------
-# Totals
+# Totals（堅牢化）
 # --------------------------
 class MoneyBreakdown(BaseModel):
     subtotal: float
@@ -147,13 +147,22 @@ class MoneyBreakdown(BaseModel):
 def round2(v: float) -> float:
     return float(f"{v:.2f}")
 
-def compute_totals(items: list[dict]) -> MoneyBreakdown:
+def _get(v: Any, key: str, default=0.0):
+    # モデルでも dict でもOKにする
+    if isinstance(v, dict):
+        return v.get(key, default)
+    return getattr(v, key, default)
+
+def compute_totals(items: list[Any]) -> MoneyBreakdown:
     subtotal = 0.0
     tax = 0.0
     for it in items:
-        line = it["quantity"] * it["unit_price"]
+        qty = float(_get(it, "quantity", 0) or 0)
+        unit = float(_get(it, "unit_price", 0) or 0)
+        rate = float(_get(it, "tax_rate", 0) or 0)
+        line = qty * unit
         subtotal += line
-        tax += line * it.get("tax_rate", 0.0)
+        tax += line * rate
     return MoneyBreakdown(subtotal=round2(subtotal), tax=round2(tax), total=round2(subtotal + tax))
 
 # --------------------------
@@ -176,7 +185,6 @@ def custom_openapi():
         description="Mini Invoice/Estimate SaaS API",
         routes=app.routes,
     )
-    # securitySchemes を追加
     openapi_schema.setdefault("components", {}).setdefault("securitySchemes", {})
     openapi_schema["components"]["securitySchemes"]["APIKeyHeader"] = {
         "type": "apiKey",
@@ -242,7 +250,7 @@ def get_quote(quote_id: int, session: Session = Depends(get_session)):
     if not q:
         raise HTTPException(404, "Quote not found")
     items = session.exec(select(QuoteItem).where(QuoteItem.quote_id == quote_id)).all()
-    totals = compute_totals([it.dict() for it in items])
+    totals = compute_totals(items)  # dict化せず、そのまま渡す
     return {"quote": q, "items": items, "totals": totals}
 
 @app.post("/quotes/{quote_id}/items", dependencies=[Depends(require_api_key)])
@@ -267,7 +275,7 @@ def get_invoice(invoice_id: int, session: Session = Depends(get_session)):
     if not inv:
         raise HTTPException(404, "Invoice not found")
     items = session.exec(select(InvoiceItem).where(InvoiceItem.invoice_id == invoice_id)).all()
-    totals = compute_totals([it.dict() for it in items])
+    totals = compute_totals(items)
     return {"invoice": inv, "items": items, "totals": totals}
 
 @app.post("/invoices/{invoice_id}/items", dependencies=[Depends(require_api_key)])
@@ -285,4 +293,3 @@ def root():
 # -------- ChatGPT router を最後に組み込む（app 定義後） --------
 from openai_integration import router as ai_router
 app.include_router(ai_router, prefix="/ai", tags=["ai"])
-