Update

2026-07-09 02:52:54 +02:00
parent 818568c609
commit 48bb6c2ec2
95 changed files with 6115 additions and 267 deletions
@@ -65,6 +65,76 @@ def test_model_route_create_and_economy(seeded_db):
    assert admin.delete(f"{BASE_URL}/admin/gateway/models/{source}").status_code == 404


+def test_model_route_tiered_and_off_peak_pricing_round_trip(seeded_db):
+    admin = admin_session(seeded_db)
+    source = _unique_gateway("tiered")
+
+    created = admin.post(
+        f"{BASE_URL}/admin/gateway/models",
+        json={
+            "source_model": source,
+            "target_model": "vendor/tiered",
+            "kind": "chat",
+            "price_cache_hit_per_m": 0.0028,
+            "price_cache_miss_per_m": 0.14,
+            "price_output_per_m": 0.28,
+            "context_tier_threshold_tokens": 128000,
+            "price_output_per_m_tier2": 0.56,
+            "off_peak_start_minute": 990,
+            "off_peak_end_minute": 30,
+            "off_peak_discount_pct": 25.0,
+        },
+    )
+    assert created.status_code == 200, created.text[:300]
+    model = created.json()["model"]
+    assert model["context_tier_threshold_tokens"] == 128000
+    assert model["price_output_per_m_tier2"] == 0.56
+    assert model["price_cache_hit_per_m_tier2"] is None
+    assert model["off_peak_start_minute"] == 990
+    assert model["off_peak_end_minute"] == 30
+    assert model["off_peak_discount_pct"] == 25.0
+
+    listed = admin.get(f"{BASE_URL}/admin/gateway/models").json()
+    row = next(m for m in listed["models"] if m["source_model"] == source)
+    assert row["context_tier_threshold_tokens"] == 128000
+    assert row["price_output_per_m_tier2"] == 0.56
+    assert row["off_peak_start_minute"] == 990
+    assert row["off_peak_end_minute"] == 30
+    assert row["off_peak_discount_pct"] == 25.0
+
+    deleted = admin.delete(f"{BASE_URL}/admin/gateway/models/{source}")
+    assert deleted.status_code == 200
+
+
+def test_model_route_off_peak_requires_both_start_and_end(seeded_db):
+    admin = admin_session(seeded_db)
+    source = _unique_gateway("badwindow")
+
+    only_start = admin.post(
+        f"{BASE_URL}/admin/gateway/models",
+        json={
+            "source_model": source,
+            "target_model": "vendor/w",
+            "kind": "chat",
+            "off_peak_start_minute": 60,
+        },
+    )
+    assert only_start.status_code == 400
+    assert only_start.json()["ok"] is False
+
+    only_end = admin.post(
+        f"{BASE_URL}/admin/gateway/models",
+        json={
+            "source_model": source,
+            "target_model": "vendor/w",
+            "kind": "chat",
+            "off_peak_end_minute": 120,
+        },
+    )
+    assert only_end.status_code == 400
+    assert only_end.json()["ok"] is False
+
+
 def test_model_route_validation(seeded_db):
    admin = admin_session(seeded_db)
    missing_target = admin.post(
@@ -103,3 +103,44 @@ def test_restore_revives_post_and_records_audit(seeded_db):
    entry = _audit_find(admin, "admin.trash.restore", post["uid"])
    assert entry is not None
    assert entry["result"] == "success"
+
+
+def test_restore_revoked_award_recomputes_stats(seeded_db):
+    from datetime import datetime, timezone
+    from devplacepy.database.awards import revoke_award
+    from devplacepy.utils import generate_uid, make_combined_slug
+
+    admin = _admin_trash(seeded_db)
+    bob = get_table("users").find_one(username="bob_test")
+    alice = get_table("users").find_one(username="alice_test")
+    uid = generate_uid()
+    slug = make_combined_slug("Trash restore", uid)
+    now = datetime.now(timezone.utc).isoformat()
+    get_table("awards").insert(
+        {
+            "uid": uid,
+            "slug": slug,
+            "description": "Trash restore",
+            "giver_uid": alice["uid"],
+            "receiver_uid": bob["uid"],
+            "attachment_uid_512": "",
+            "attachment_uid_256": "",
+            "attachment_uid_64": "",
+            "generated_at": now,
+            "created_at": now,
+            "job_uid": "",
+            "deleted_at": None,
+            "deleted_by": None,
+        }
+    )
+    revoke_award(uid, alice["uid"])
+    r = admin.post(
+        f"{BASE_URL}/admin/trash/awards/{uid}/restore",
+        headers=JSON_trash,
+        allow_redirects=False,
+    )
+    assert r.status_code == 200, r.text[:300]
+    row = get_table("users").find_one(uid=bob["uid"])
+    assert row.get("award_count") == 1
+    assert row.get("last_award_uid") == uid
+    assert requests.get(f"{BASE_URL}/awards/{slug}/256").status_code in (302, 404)