Update app.py

app.py

@@ -1,6 +1,5 @@
-# app.py
 import os, time, html, logging, requests, threading
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import HTMLResponse, JSONResponse
 
@@ -49,6 +48,46 @@ def _get_with_backoff(url: str) -> Dict[str, Any]:
         raise HTTPException(status_code=502, detail=f"Replicate error {r.status_code}: {r.text[:500]}")
     raise HTTPException(status_code=429, detail="Too many retries after 429 responses.")
 
+def _license_label_and_url(m: Dict[str, Any]) -> Tuple[str, Optional[str]]:
+    """
+    Prefer explicit license_url; fall back to a 'license' text field if present.
+    Returns (label, url or None). Label is normalized toward SPDX-style.
+    """
+    url = m.get("license_url")
+    txt = (m.get("license") or "").strip() if not url else ""
+
+    if url:
+        # Derive a short, user-friendly label from the URL path.
+        try:
+            import urllib.parse as up, re
+            last = up.urlparse(url).path.rstrip("/").split("/")[-1]
+            last = re.sub(r"(?i)\.(html|md)$", "", last)
+            # Normalize a few common SPDX forms
+            norm = {
+                "apache-2.0": "Apache-2.0",
+                "apache 2.0": "Apache-2.0",
+                "mit": "MIT",
+                "gpl-3.0": "GPL-3.0",
+                "gpl 3.0": "GPL-3.0",
+                "agpl-3.0": "AGPL-3.0",
+                "agpl 3.0": "AGPL-3.0",
+                "bsd-3-clause": "BSD-3-Clause",
+                "bsd 3 clause": "BSD-3-Clause",
+                "cc-by-4.0": "CC-BY-4.0",
+                "cc by 4.0": "CC-BY-4.0",
+                "cc-by-nc-4.0": "CC-BY-NC-4.0",
+                "cc by nc 4.0": "CC-BY-NC-4.0",
+            }
+            key = last.replace("_", "-").lower()
+            label = norm.get(key, (last or "License"))
+        except Exception:
+            label = "License"
+        return (label, url)
+    elif txt:
+        return (txt, None)
+    else:
+        return ("Unknown", None)
+
 def _ensure_page_loaded(target_index: int) -> None:
     """
     Ensure pages up to target_index (0-based) are loaded into _pages.
@@ -106,19 +145,48 @@ def _render_table(models: List[Dict[str, Any]]) -> str:
         tags = m.get("tags") or m.get("categories") or []
         tags_html = " ".join(f"<span class='tag'>{html.escape(str(t))}</span>" for t in tags[:8])
 
+        # License
+        lic_label, lic_url = _license_label_and_url(m)
+        lic_label_h = html.escape(lic_label)
+        lic_html = f"<a href='{html.escape(lic_url)}' target='_blank' rel='noopener'>{lic_label_h}</a>" if lic_url else lic_label_h
+
+        # External sources
+        src_links = []
+        if m.get("github_url"):
+            src_links.append(f"<a href='{html.escape(m['github_url'])}' target='_blank' rel='noopener'>GitHub</a>")
+        if m.get("paper_url"):
+            src_links.append(f"<a href='{html.escape(m['paper_url'])}' target='_blank' rel='noopener'>Paper</a>")
+        if lic_url:
+            src_links.append(f"<a href='{html.escape(lic_url)}' target='_blank' rel='noopener'>License</a>")
+        sources_html = " | ".join(src_links) if src_links else ""
+
+        # Run count
+        run_ct = m.get("run_count")
+        run_html = f"<span class='pill'>{run_ct:,} runs</span>" if isinstance(run_ct, int) else ""
+
         thumb_html = f"<img src='{html.escape(thumb)}' alt='' />" if thumb else ""
         rows.append(
             f"<tr>"
             f"<td class='thumb'>{thumb_html}</td>"
-            f"<td class='id'>{mid}</td>"
+            f"<td class='id'>{mid}<br>{run_html}</td>"
             f"<td class='desc'>{desc}</td>"
             f"<td class='vis'>{vis}</td>"
+            f"<td class='lic'>{lic_html}</td>"
+            f"<td class='src'>{sources_html}</td>"
             f"<td class='tags'>{tags_html}</td>"
             f"</tr>"
         )
     return (
         "<table class='grid'>"
-        "<thead><tr><th>Thumbnail</th><th>ID</th><th>Description</th><th>Visibility</th><th>Tags</th></tr></thead>"
+        "<thead><tr>"
+        "<th>Thumbnail</th>"
+        "<th>ID / Runs</th>"
+        "<th>Description</th>"
+        "<th>Visibility</th>"
+        "<th>License</th>"
+        "<th>Sources</th>"
+        "<th>Tags</th>"
+        "</tr></thead>"
         "<tbody>"
         + "\n".join(rows) +
         "</tbody></table>"
@@ -187,6 +255,8 @@ def _shell(page_index_0: int, html_table: str, *, search_query: str = "") -> str
   .id {{ font-weight: 600; white-space: nowrap; }}
   .desc {{ color: #333; max-width: 700px; }}
   .vis {{ white-space: nowrap; color: #555; }}
+  .lic {{ white-space: nowrap; }}
+  .src {{ font-size: 13px; color: #0366d6; }}
   .tags .tag {{ display: inline-block; padding: 2px 8px; margin: 2px; background: #f2f2f7; border: 1px solid #e5e5ea; border-radius: 999px; font-size: 12px; color: #333; }}
   .pagination {{ margin-top: 20px; }}
   .page {{ display: inline-block; padding: 6px 10px; margin-right: 6px; border: 1px solid #ddd; border-radius: 6px; text-decoration: none; color: #333; }}
@@ -207,16 +277,13 @@ def _shell(page_index_0: int, html_table: str, *, search_query: str = "") -> str
     <span class="pill">building: {building}</span>
     <span class="pill">complete: {complete}</span>
   </div>
-
   <form class="searchbar" method="GET" action="/search" onsubmit="return onSearchSubmit();" >
     <input id="q" name="q" type="text" placeholder="Search models, descriptions, tags" value="{html.escape(search_query)}" {search_disabled} />
     <button id="qbtn" type="submit" {search_disabled}>Search</button>
     <span id="searchHint" style="color:#666; font-size:12px;">{'' if _BUILD_COMPLETE else 'Search available after catalog completes.'}</span>
   </form>
-
   {html_table}
   {_render_pagination(page_num)}
-
 <script>
   // Start building after the first render completes
   document.addEventListener("DOMContentLoaded", function() {{
@@ -244,7 +311,6 @@ def _shell(page_index_0: int, html_table: str, *, search_query: str = "") -> str
       }};
       poll();
   }});
-
   function onSearchSubmit() {{
     const q = document.getElementById("q");
     return q && !q.disabled;
@@ -313,9 +379,4 @@ def search(q: str = ""):
     base_models = _pages[idx]["results"] if _pages else []
     if _BUILD_COMPLETE and q.strip():
         results = _search_models(q)
-        content = _render_table(results)
-        return HTMLResponse(_shell(idx, content, search_query=q))
-    else:
-        # Show page 1 with disabled search and a hint
-        content = _render_table(base_models)
-        return HTMLResponse(_shell(idx, content, search_query=q))
+        content = _render_table(results