Upload 4 files

app.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta, timezone
 from threading import Lock
 
 import httpx
-from fastapi import FastAPI, HTTPException, Request
+from fastapi import FastAPI, HTTPException
 from fastapi.responses import FileResponse, JSONResponse
 from fastapi.middleware.cors import CORSMiddleware
 from starlette.staticfiles import StaticFiles
@@ -32,6 +32,10 @@ conn = sqlite3.connect(DB_PATH, check_same_thread=False)
 conn.row_factory = sqlite3.Row
 db_lock = Lock()
 
+def column_exists(table: str, col: str) -> bool:
+    rows = conn.execute(f"PRAGMA table_info({table})").fetchall()
+    return any(r["name"] == col for r in rows)
+
 def init_db():
     with db_lock:
         c = conn.cursor()
@@ -41,8 +45,7 @@ def init_db():
               name TEXT NOT NULL,
               method TEXT DEFAULT 'GET',
               expected_min INT DEFAULT 200,
-              expected_max INT DEFAULT 399,
-              created_at TEXT DEFAULT (datetime('now'))
+              expected_max INT DEFAULT 399
             );
         """)
         c.execute("""
@@ -65,6 +68,9 @@ def init_db():
               FOREIGN KEY (url) REFERENCES sites(url)
             );
         """)
+        # --- schema migration: add hf_token if missing ---
+        if not column_exists("sites", "hf_token"):
+            c.execute("ALTER TABLE sites ADD COLUMN hf_token TEXT")
         conn.commit()
 
         # Seed a few demo sites if empty
@@ -77,9 +83,12 @@ def init_db():
                     pass
             conn.commit()
 
-def list_sites():
+def list_sites(include_secret: bool = False):
+    cols = "url, name, method, expected_min, expected_max"
+    if include_secret:
+        cols += ", hf_token"
     with db_lock:
-        rows = conn.execute("SELECT url, name, method, expected_min, expected_max FROM sites ORDER BY url").fetchall()
+        rows = conn.execute(f"SELECT {cols} FROM sites ORDER BY url").fetchall()
     return [dict(r) for r in rows]
 
 def get_last_check(url: str):
@@ -104,11 +113,9 @@ def record_check(url: str, ok: int, status_code: int | None, ms: float | None, t
 
 def open_incident_if_needed(url: str, now_iso: str, prev_ok: int | None, current_ok: int):
     with db_lock:
-        # If transitioning from UP->DOWN, open a new incident
         if (prev_ok == 1 or prev_ok is None) and current_ok == 0:
             conn.execute("INSERT INTO incidents(url, start_ts) VALUES (?,?)", (url, now_iso))
             conn.commit()
-        # If transitioning from DOWN->UP, close the latest open incident
         elif prev_ok == 0 and current_ok == 1:
             conn.execute(
                 "UPDATE incidents SET end_ts=? WHERE url=? AND end_ts IS NULL",
@@ -144,12 +151,19 @@ async def check_one(client: httpx.AsyncClient, site: dict):
     expected_min = int(site.get("expected_min", 200))
     expected_max = int(site.get("expected_max", 399))
 
+    # Build per-site headers (HF Org Spaces need Authorization)
+    headers = {}
+    token = (site.get("hf_token") or "").strip()
+    if token:
+        if token.lower().startswith("bearer "):
+            token = token[7:].strip()
+        headers["Authorization"] = f"Bearer {token}"
+
     t0 = time.perf_counter()
     code = None
     ok = 0
     try:
-        # Use GET with follow_redirects to treat 3xx as success if within range
-        resp = await client.get(url, follow_redirects=True, timeout=HTTP_TIMEOUT_SECONDS)
+        resp = await client.get(url, headers=headers, follow_redirects=True, timeout=HTTP_TIMEOUT_SECONDS)
         code = resp.status_code
         ok = 1 if (expected_min <= code <= expected_max) else 0
     except Exception:
@@ -163,16 +177,10 @@ async def check_one(client: httpx.AsyncClient, site: dict):
     record_check(url, ok, code, ms, now_iso)
     open_incident_if_needed(url, now_iso, prev_ok, ok)
 
-    return {
-        "url": url,
-        "ok": ok,
-        "status_code": code,
-        "ms": ms,
-        "ts": now_iso
-    }
+    return {"url": url, "ok": ok, "status_code": code, "ms": ms, "ts": now_iso}
 
 async def run_checks():
-    sites = list_sites()
+    sites = list_sites(include_secret=True)
     if not sites:
         return []
     limits = httpx.Limits(max_connections=20, max_keepalive_connections=10)
@@ -183,9 +191,8 @@ async def run_checks():
 # --------------------------
 # API & Scheduler
 # --------------------------
-app = FastAPI(title="HF Uptime Monitor", version="1.0.0")
+app = FastAPI(title="HF Uptime Monitor", version="1.1.0")  # bumped
 
-# Simple CORS for same-origin front-end
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"], allow_methods=["*"], allow_headers=["*"]
@@ -194,14 +201,12 @@ app.add_middleware(
 class SiteIn(BaseModel):
     url: HttpUrl
     name: str
+    hf_token: str | None = None  # optional Bearer token without prefix
 
 @app.on_event("startup")
 async def on_startup():
     init_db()
-    # Kick an immediate check on boot (don't await, run in background)
     asyncio.create_task(run_checks())
-
-    # Start APScheduler
     scheduler = AsyncIOScheduler()
     scheduler.add_job(run_checks, "interval", seconds=CHECK_INTERVAL_SECONDS, next_run_time=datetime.now(timezone.utc))
     scheduler.start()
@@ -213,7 +218,8 @@ async def on_shutdown():
     if sched:
         sched.shutdown(wait=False)
 
-# Static files
+# Static files (if you keep external files). If using the inline HTML above,
+# just place it at ./static/index.html and keep this as-is.
 app.mount("/static", StaticFiles(directory="static"), name="static")
 
 @app.get("/")
@@ -222,25 +228,33 @@ def root():
 
 @app.get("/api/sites")
 def api_sites():
-    return JSONResponse(list_sites())
+    # Public listing (no secrets)
+    public = list_sites(include_secret=False)
+    return JSONResponse(public)
 
 @app.post("/api/sites")
 def api_add_site(site: SiteIn):
-    url_s = str(site.url)              # <- cast from HttpUrl to str
+    url_s = str(site.url)
     name_s = (site.name or "").strip() or url_s
+    tok = (site.hf_token or "").strip()
+    if tok.lower().startswith("bearer "):
+        tok = tok[7:].strip()
     with db_lock:
         try:
+            # upsert-ish: try insert; if exists, update token/name
             conn.execute(
-                "INSERT OR IGNORE INTO sites(url, name) VALUES (?, ?)",
-                (url_s, name_s)
+                "INSERT OR IGNORE INTO sites(url, name, hf_token) VALUES (?, ?, ?)",
+                (url_s, name_s, tok or None)
+            )
+            conn.execute(
+                "UPDATE sites SET name=?, hf_token=? WHERE url=?",
+                (name_s, tok or None, url_s)
             )
             conn.commit()
         except sqlite3.Error as e:
-            # bubble up the real DB message so the UI can show it
             raise HTTPException(400, f"DB error: {e}")
     return {"ok": True}
 
-
 @app.delete("/api/sites")
 def api_delete_site(url: str):
     with db_lock:
@@ -257,7 +271,7 @@ async def api_check_now():
 
 @app.get("/api/status")
 def api_status():
-    sites = list_sites()
+    sites = list_sites(include_secret=False)  # do NOT leak tokens
     now = datetime.now(timezone.utc)
     since_24h = now - timedelta(hours=24)
     since_7d = now - timedelta(days=7)
@@ -267,20 +281,18 @@ def api_status():
         last = get_last_check(s["url"])
         u24 = uptime_ratio(s["url"], since_24h)
         u7 = uptime_ratio(s["url"], since_7d)
-        open_incident = False
         with db_lock:
             open_inc = conn.execute(
                 "SELECT 1 FROM incidents WHERE url=? AND end_ts IS NULL LIMIT 1",
                 (s["url"],)
             ).fetchone()
             open_incident = bool(open_inc)
-
         out.append({
             "url": s["url"],
             "name": s["name"],
-            "last": last,            # {ts, ok, status_code, ms} or None
-            "uptime24h": u24,        # float or None
-            "uptime7d": u7,          # float or None
+            "last": last,
+            "uptime24h": u24,
+            "uptime7d": u7,
             "open_incident": open_incident
         })
     return out
@@ -295,4 +307,4 @@ def api_ping():
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=PORT)
+    uvicorn.run(app, host="0.0.0.0", port=PORT)

static/index.html

@@ -4,7 +4,54 @@
   <meta charset="utf-8"/>
   <meta name="viewport" content="width=device-width,initial-scale=1"/>
   <title>Uptime Monitor</title>
-  <link rel="stylesheet" href="/static/style.css"/>
+  <style>
+    :root{
+      --bg:#0b1220; --panel:#121a2e; --card:#0f1730; --text:#e6edf7; --muted:#9fb0cf;
+      --green:#18c37e; --red:#ff6363; --accent:#3a8dde; --ring: rgba(58,141,222,.35);
+      --radius:16px; --shadow: 0 10px 28px rgba(2,8,23,.35);
+    }
+    *{box-sizing:border-box}
+    html,body{height:100%}
+    body{margin:0; font: 15px/1.45 ui-sans-serif, system-ui, -apple-system, Segoe UI, Roboto, Arial;
+      color:var(--text); background:linear-gradient(180deg,#0b1220,#0b1220 60%, #0d1530);}
+    header{display:flex; align-items:center; justify-content:space-between; padding:16px 22px;
+      position:sticky; top:0; background:#0b1220cc; backdrop-filter:saturate(120%) blur(6px); border-bottom:1px solid #1b2542;}
+    .brand{display:flex; align-items:center; gap:12px;}
+    .logo-dot{width:14px; height:14px; border-radius:50%; background:linear-gradient(135deg,var(--accent),#6ea8ff); box-shadow:0 0 20px #2e6fd6;}
+    .title{font-weight:700; letter-spacing:.3px}
+    .actions button{background:var(--accent); color:white; border:none; padding:10px 14px; border-radius:12px; cursor:pointer;
+      box-shadow:var(--shadow); margin-left:8px; font-weight:600;}
+    .actions button#addSiteBtn{background:#243254; border:1px solid #2d3c63}
+    main{max-width:1100px; margin:26px auto; padding:0 16px; display:grid; gap:18px}
+    .card{background:var(--panel); border-radius:var(--radius); box-shadow:var(--shadow); border:1px solid #1b2542;}
+    .card-head{display:flex; align-items:center; justify-content:space-between; padding:16px 18px; border-bottom:1px solid #1b2542}
+    .muted{color:var(--muted); font-size:13px}
+    .table-wrap{overflow:auto}
+    table{width:100%; border-collapse:collapse}
+    th, td{padding:12px 14px; border-bottom:1px solid #1b2542; text-align:left}
+    th{color:var(--muted); font-weight:600; background:#0f1730}
+    tbody tr:hover{background:#0f1730}
+    .dot{width:12px; height:12px; border-radius:50%; box-shadow:0 0 0 3px #0b1220, 0 0 16px rgba(0,0,0,.25); display:inline-block;}
+    .dot.green{background:var(--green)} .dot.red{background:var(--red)}
+    a.url{color:#a9c6ff; text-decoration:none} a.url:hover{text-decoration:underline}
+    .badge{padding:4px 8px; border-radius:999px; font-size:12px; border:1px solid #263257; color:#c9d7ff; background:#102143}
+    td .row-actions{display:flex; gap:8px}
+    button.ghost{background:transparent; border:1px solid #27355f; color:#c9d7ff; padding:8px 12px; border-radius:12px; cursor:pointer;}
+    .hidden{display:none}
+    .incidents{padding:10px 16px}
+    .incident{display:flex; align-items:center; justify-content:space-between; background:#0f1730; border:1px solid #1b2542;
+      border-radius:12px; padding:10px 12px; margin-bottom:10px;}
+    .incident .down{color:#ff9f9f} .incident .ok{color:#9fffc7}
+    dialog{border:none; border-radius:18px; padding:0; background:#111a31; color:var(--text); box-shadow: var(--shadow);}
+    .dialog-card{padding:18px; width:380px}
+    .dialog-card h3{margin:0 0 10px}
+    .dialog-card label{display:block; margin:10px 0}
+    .dialog-card input{width:100%; padding:10px 12px; border-radius:12px; border:1px solid #283663; background:#0f1730; color:var(--text);}
+    .dialog-card small{color:var(--muted)}
+    .dialog-card .row{display:flex; gap:10px; margin-top:14px}
+    .dialog-card button{background:var(--accent); color:white; border:none; padding:10px 14px; border-radius:12px; cursor:pointer; font-weight:600;}
+    .dialog-card button.ghost{background:transparent; border:1px solid #27355f; color:#c9d7ff}
+  </style>
 </head>
 <body>
   <header>
@@ -58,10 +105,14 @@
     <form method="dialog" id="addForm" class="dialog-card">
       <h3>Add Site</h3>
       <label>Display Name
-        <input type="text" id="siteName" placeholder="e.g., My API"/>
+        <input type="text" id="siteName" placeholder="e.g., Weather API"/>
       </label>
       <label>URL
-        <input type="url" id="siteUrl" placeholder="https://example.com" required/>
+        <input type="url" id="siteUrl" placeholder="https://example.com/api/ping" required/>
+      </label>
+      <label>Hugging Face token (optional)
+        <input type="password" id="hfToken" placeholder="hf_..." autocomplete="off"/>
+        <small>Needed for private/Org Spaces. Paste only the token (without “Bearer”).</small>
       </label>
       <div class="row">
         <button type="submit" id="saveSite">Save</button>
@@ -70,6 +121,152 @@
     </form>
   </dialog>
 
-  <script src="/static/app.js"></script>
+  <script>
+    const tbody = document.getElementById("statusTbody");
+    const lastRefresh = document.getElementById("lastRefresh");
+    const checkNowBtn = document.getElementById("checkNowBtn");
+    const addSiteBtn = document.getElementById("addSiteBtn");
+    const addDialog = document.getElementById("addDialog");
+    const addForm = document.getElementById("addForm");
+    const cancelAdd = document.getElementById("cancelAdd");
+    const siteName = document.getElementById("siteName");
+    const siteUrl = document.getElementById("siteUrl");
+    const hfToken = document.getElementById("hfToken");
+
+    const incidentPane = document.getElementById("incidentPane");
+    const incidentTitle = document.getElementById("incidentTitle");
+    const incidentsList = document.getElementById("incidentsList");
+    const closeIncidents = document.getElementById("closeIncidents");
+
+    function fmtTs(s){
+      if(!s) return "—";
+      const d = new Date(s);
+      return d.toLocaleString();
+    }
+    function fmtPct(v){
+      if(v === null || v === undefined) return "—";
+      return `${v.toFixed ? v.toFixed(2) : v}%`;
+    }
+    function dot(ok){
+      return `<span class="dot ${ok ? 'green':'red'}" title="${ok?'UP':'DOWN'}"></span>`;
+    }
+
+    async function fetchStatus(){
+      const res = await fetch("/api/status");
+      const data = await res.json();
+      tbody.innerHTML = "";
+      data.forEach(item => {
+        const last = item.last || {};
+        const tr = document.createElement("tr");
+        tr.innerHTML = `
+          <td>${dot(last.ok)}</td>
+          <td>${item.name}</td>
+          <td><a class="url" href="${item.url}" target="_blank" rel="noopener">${item.url}</a></td>
+          <td>${fmtTs(last.ts)}</td>
+          <td>${last.ms ?? "—"}</td>
+          <td>${last.status_code ?? "—"}</td>
+          <td><span class="badge">${fmtPct(item.uptime24h)}</span></td>
+          <td><span class="badge">${fmtPct(item.uptime7d)}</span></td>
+          <td class="row-actions">
+            <button class="ghost" data-action="incidents" data-url="${item.url}" data-name="${item.name}">Incidents</button>
+            <button class="ghost" data-action="delete" data-url="${item.url}">Delete</button>
+          </td>
+        `;
+        tbody.appendChild(tr);
+      });
+      lastRefresh.textContent = `Last refresh: ${new Date().toLocaleTimeString()}`;
+    }
+
+    async function checkNow(){
+      checkNowBtn.disabled = true;
+      try{
+        await fetch("/api/check-now", {method:"POST"});
+        await fetchStatus();
+      } finally {
+        checkNowBtn.disabled = false;
+      }
+    }
+
+    function openAdd(){
+      siteName.value = "";
+      siteUrl.value = "";
+      hfToken.value = "";
+      addDialog.showModal();
+    }
+    function closeAdd(){ addDialog.close(); }
+
+    addForm.addEventListener("submit", async (e) => {
+      e.preventDefault();
+      const body = { name: siteName.value || siteUrl.value, url: siteUrl.value };
+      const tok = (hfToken.value || "").trim();
+      if (tok) {
+        body.hf_token = tok.startsWith("Bearer ") ? tok.slice(7).trim() : tok;
+      }
+      const res = await fetch("/api/sites", {
+        method:"POST",
+        headers: { "Content-Type":"application/json" },
+        body: JSON.stringify(body)
+      });
+      if (res.ok){
+        closeAdd();
+        await fetchStatus();
+      } else {
+        const msg = await res.text();
+        alert("Failed to add site:\n" + msg);
+      }
+    });
+
+    cancelAdd.addEventListener("click", (e)=>{ e.preventDefault(); closeAdd(); });
+
+    tbody.addEventListener("click", async (e) => {
+      const btn = e.target.closest("button");
+      if(!btn) return;
+      const action = btn.dataset.action;
+      const url = btn.dataset.url;
+      if(action === "delete"){
+        if(confirm(`Delete monitor for:\n${url}?`)){
+          await fetch(`/api/sites?url=${encodeURIComponent(url)}`, { method: "DELETE" });
+          await fetchStatus();
+        }
+      }
+      if(action === "incidents"){
+        await loadIncidents(url, btn.dataset.name || url);
+      }
+    });
+
+    async function loadIncidents(url, name){
+      const res = await fetch(`/api/incidents?url=${encodeURIComponent(url)}`);
+      const data = await res.json();
+      incidentPane.classList.remove("hidden");
+      incidentTitle.textContent = `Incidents — ${name}`;
+      if(!data.length){
+        incidentsList.innerHTML = `<div class="muted" style="padding:8px 2px">No incidents recorded.</div>`;
+        return;
+      }
+      incidentsList.innerHTML = "";
+      data.forEach(x => {
+        const end = x.end_ts ? new Date(x.end_ts) : null;
+        const start = new Date(x.start_ts);
+        const durationMin = end ? Math.max(0, Math.round((end - start)/60000)) : null;
+        const div = document.createElement("div");
+        div.className = "incident";
+        div.innerHTML = `
+          <div>
+            <div><strong class="down">DOWN</strong> ${start.toLocaleString()}</div>
+            ${end ? `<div><strong class="ok">UP</strong> ${end.toLocaleString()}</div>` : `<div class="muted">ongoing...</div>`}
+          </div>
+          <div class="muted">${durationMin !== null ? durationMin + " min" : ""}</div>
+        `;
+        incidentsList.appendChild(div);
+      });
+    }
+    closeIncidents.addEventListener("click", ()=> incidentPane.classList.add("hidden"));
+
+    document.getElementById("checkNowBtn").addEventListener("click", checkNow);
+    document.getElementById("addSiteBtn").addEventListener("click", openAdd);
+
+    fetchStatus();
+    setInterval(fetchStatus, 30000);
+  </script>
 </body>
 </html>