Upload 3 files

app/billing.py

@@ -277,6 +277,7 @@ async def recent_logs(db: AsyncSession, limit: int = 100, offset: int = 0) -> li
             "prompt_tokens": r.prompt_tokens,
             "completion_tokens": r.completion_tokens,
             "total_tokens": r.total_tokens,
+            "cached_tokens": r.cached_tokens,
             "cost_usd": r.cost_usd,
             "status": r.status,
             "http_status": r.http_status,

app/main.py

@@ -32,6 +32,9 @@ settings = get_settings()
 # 后台可编辑并热加载到运行时的参数
 EDITABLE_KEYS = admin.EDITABLE_KEYS
 
+# 旧版种子数据中已失效的模型名（Parasail 已下架），迁移时删除
+_LEGACY_MODELS = {"parasail-deepseek-r1", "parasail-kimi-k25-elicit", "parasail-ai/GritLM-7B-vllm", "meta-llama/Llama-3.1-8B-Instruct"}
+
 
 async def _init_db() -> None:
     """建表（首次部署自动创建）。连接失败时打印脱敏诊断，便于定位 DATABASE_URL 问题。"""
@@ -60,20 +63,31 @@ async def _seed_admin() -> None:
 
 
 async def _migrate_pricing() -> None:
-    """为已有数据库添加 cache_read_per_m 列，并回填种子缓存价。"""
+    """迁移：加列、删旧种子、回填缓存价，并补入新种子模型。"""
     async with engine.begin() as conn:
         try:
             await conn.execute(text(
                 "ALTER TABLE model_pricing ADD COLUMN IF NOT EXISTS cache_read_per_m FLOAT DEFAULT 0.0"
             ))
+            await conn.execute(text(
+                "ALTER TABLE request_logs ADD COLUMN IF NOT EXISTS cached_tokens INTEGER DEFAULT 0"
+            ))
         except Exception:
             pass  # 列已存在或非 PostgreSQL，忽略
-    # 回填：已有行 cache_read_per_m 仍为 0 且种子数据有非零值的，更新为种子价
+
     async with SessionLocal() as db:
+        # 删除旧版已失效的种子模型
+        for m in _LEGACY_MODELS:
+            await db.execute(delete(ModelPricing).where(ModelPricing.model == m))
+
+        # 回填：已有行 cache_read_per_m 仍为 0 且种子数据有非零值的，更新为种子价
         for model, ip, op, cp in B.DEFAULT_PRICING:
             row = (await db.execute(select(ModelPricing).where(ModelPricing.model == model))).scalar_one_or_none()
             if row and row.cache_read_per_m == 0.0 and cp > 0.0:
                 row.cache_read_per_m = cp
+            elif not row:
+                # 种子数据中不存在的新模型，直接插入
+                db.add(ModelPricing(model=model, input_per_m=ip, output_per_m=op, cache_read_per_m=cp))
         await db.commit()
 
 

app/models.py

@@ -73,6 +73,7 @@ class RequestLog(Base):
     prompt_tokens: Mapped[int] = mapped_column(Integer, default=0)
     completion_tokens: Mapped[int] = mapped_column(Integer, default=0)
     total_tokens: Mapped[int] = mapped_column(Integer, default=0)
+    cached_tokens: Mapped[int] = mapped_column(Integer, default=0)
     cost_usd: Mapped[float] = mapped_column(Float, default=0.0)
     # success / failed / error
     status: Mapped[str] = mapped_column(String(16), index=True, default="success")