Update app.py

app.py

@@ -1,162 +1,134 @@
-import faicons as fa
-import plotly.express as px
-
-# Load data and compute static values
-from shared import app_dir, tips
-from shinywidgets import render_plotly
-
-from shiny import reactive, render
-from shiny.express import input, ui
-
-bill_rng = (min(tips.total_bill), max(tips.total_bill))
-
-# Add page title and sidebar
-ui.page_opts(title="Restaurant tipping", fillable=True)
-
-with ui.sidebar(open="desktop"):
-    ui.input_slider(
-        "total_bill",
-        "Bill amount",
-        min=bill_rng[0],
-        max=bill_rng[1],
-        value=bill_rng,
-        pre="$",
-    )
-    ui.input_checkbox_group(
-        "time",
-        "Food service",
-        ["Lunch", "Dinner"],
-        selected=["Lunch", "Dinner"],
-        inline=True,
+from fastapi import FastAPI, Request
+from fastapi.responses import HTMLResponse, JSONResponse
+import os, pathlib, json
+
+from Deployment_UI import router as deployment_ui_router
+from Deployment_UI_BE import router as deployment_be_router
+from modelblob import router as modelblob_router  # NEW (blob page + /modelblob.json)
+
+app = FastAPI()
+app.include_router(deployment_ui_router)
+app.include_router(deployment_be_router)
+app.include_router(modelblob_router)  # NEW
+
+LOCAL_BLOB_PATH = os.getenv("MODEL_BLOB_PATH", "/tmp/model_blob.json")
+
+def _load_blob_text() -> str:
+    try:
+        if os.path.exists(LOCAL_BLOB_PATH):
+            return pathlib.Path(LOCAL_BLOB_PATH).read_text(encoding="utf-8")
+    except Exception:
+        pass
+    return "{\n  \"note\": \"paste or programmatically write the model blob to /tmp/model_blob.json\"\n}"
+
+def html_escape(s: str) -> str:
+    return (
+        s.replace("&", "&")
+         .replace("<", "&lt;")
+         .replace(">", "&gt;")
+         .replace('"', "&quot;")
+         .replace("'", "&#39;")
     )
-    ui.input_action_button("reset", "Reset filter")
-
-# Add main content
-ICONS = {
-    "user": fa.icon_svg("user", "regular"),
-    "wallet": fa.icon_svg("wallet"),
-    "currency-dollar": fa.icon_svg("dollar-sign"),
-    "ellipsis": fa.icon_svg("ellipsis"),
-}
-
-with ui.layout_columns(fill=False):
-    with ui.value_box(showcase=ICONS["user"]):
-        "Total tippers"
-
-        @render.express
-        def total_tippers():
-            tips_data().shape[0]
-
-    with ui.value_box(showcase=ICONS["wallet"]):
-        "Average tip"
-
-        @render.express
-        def average_tip():
-            d = tips_data()
-            if d.shape[0] > 0:
-                perc = d.tip / d.total_bill
-                f"{perc.mean():.1%}"
-
-    with ui.value_box(showcase=ICONS["currency-dollar"]):
-        "Average bill"
-
-        @render.express
-        def average_bill():
-            d = tips_data()
-            if d.shape[0] > 0:
-                bill = d.total_bill.mean()
-                f"${bill:.2f}"
-
-
-with ui.layout_columns(col_widths=[6, 6, 12]):
-    with ui.card(full_screen=True):
-        ui.card_header("Tips data")
-
-        @render.data_frame
-        def table():
-            return render.DataGrid(tips_data())
-
-    with ui.card(full_screen=True):
-        with ui.card_header(class_="d-flex justify-content-between align-items-center"):
-            "Total bill vs tip"
-            with ui.popover(title="Add a color variable", placement="top"):
-                ICONS["ellipsis"]
-                ui.input_radio_buttons(
-                    "scatter_color",
-                    None,
-                    ["none", "sex", "smoker", "day", "time"],
-                    inline=True,
-                )
-
-        @render_plotly
-        def scatterplot():
-            color = input.scatter_color()
-            return px.scatter(
-                tips_data(),
-                x="total_bill",
-                y="tip",
-                color=None if color == "none" else color,
-                trendline="lowess",
-            )
-
-    with ui.card(full_screen=True):
-        with ui.card_header(class_="d-flex justify-content-between align-items-center"):
-            "Tip percentages"
-            with ui.popover(title="Add a color variable"):
-                ICONS["ellipsis"]
-                ui.input_radio_buttons(
-                    "tip_perc_y",
-                    "Split by:",
-                    ["sex", "smoker", "day", "time"],
-                    selected="day",
-                    inline=True,
-                )
-
-        @render_plotly
-        def tip_perc():
-            from ridgeplot import ridgeplot
-
-            dat = tips_data()
-            dat["percent"] = dat.tip / dat.total_bill
-            yvar = input.tip_perc_y()
-            uvals = dat[yvar].unique()
-
-            samples = [[dat.percent[dat[yvar] == val]] for val in uvals]
-
-            plt = ridgeplot(
-                samples=samples,
-                labels=uvals,
-                bandwidth=0.01,
-                colorscale="viridis",
-                colormode="row-index",
-            )
-
-            plt.update_layout(
-                legend=dict(
-                    orientation="h", yanchor="bottom", y=1.02, xanchor="center", x=0.5
-                )
-            )
-
-            return plt
-
-
-ui.include_css(app_dir / "styles.css")
-
-# --------------------------------------------------------
-# Reactive calculations and effects
-# --------------------------------------------------------
-
-
-@reactive.calc
-def tips_data():
-    bill = input.total_bill()
-    idx1 = tips.total_bill.between(bill[0], bill[1])
-    idx2 = tips.time.isin(input.time())
-    return tips[idx1 & idx2]
-
 
-@reactive.effect
-@reactive.event(input.reset)
-def _():
-    ui.update_slider("total_bill", value=bill_rng)
-    ui.update_checkbox_group("time", selected=["Lunch", "Dinner"])
+@app.get("/", response_class=HTMLResponse)
+def landing_page() -> HTMLResponse:
+    blob_text = _load_blob_text()
+    html = f"""
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>RunPod Model Tester — Blob</title>
+    <style>
+      body {{ font-family: system-ui, sans-serif; margin: 24px; }}
+      pre {{ border:1px solid #ddd; border-radius:8px; padding:12px; background:#fafafa; max-height:50vh; overflow:auto; }}
+      .btn {{ display:inline-block; width:100%; max-width:680px; padding:12px 16px; margin:10px 0;
+              border:none; border-radius:8px; color:#fff; background:#0078d7; cursor:pointer; }}
+      .btn.secondary {{ background:#444; }}
+      .row {{ max-width: 980px; }}
+      #msg {{ margin-top:10px; font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size:12px; }}
+      /* overlay */
+      #blobOverlay {{ display:none; position:fixed; inset:0; background:rgba(0,0,0,.6); z-index:9999; }}
+      #blobCard {{ position:absolute; inset:4%; background:#0d1117; border-radius:12px; overflow:hidden;
+                  box-shadow:0 10px 40px rgba(0,0,0,.5); }}
+      #blobHeader {{ padding:8px 12px; background:#111; color:#c9d1d9; display:flex; justify-content:space-between; align-items:center; }}
+      #closeBlob {{ width:auto; padding:6px 10px; }}
+    </style>
+  </head>
+  <body>
+    <div class="row">
+      <h1>RunPod Model Tester — Blob</h1>
+
+      <div id="count">{len(blob_text)}</div>
+      <div>
+        <div style="font-size:12px; color:#555; margin-bottom:6px;">Model blob (read-only)</div>
+        <pre id="blob" aria-label="model blob">{html_escape(blob_text)}</pre>
+      </div>
+
+      <!-- CHANGED: pass blob URL to the UI; no separate ingest button -->
+      <a href="/Deployment_UI?blob_url=/modelblob.json"
+         class="btn secondary" style="text-decoration:none; text-align:center;">
+        Open Deployment UI
+      </a>
+      <button id="openBlob" class="btn secondary">View Model Blob</button>
+
+      <div id="msg"></div>
+    </div>
+
+    <!-- Overlay -->
+    <div id="blobOverlay" aria-hidden="true">
+      <div id="blobCard">
+        <div id="blobHeader">
+          <div>Model Blob</div>
+          <button id="closeBlob" class="btn secondary">Close</button>
+        </div>
+        <iframe src="/modelblob" title="Model Blob" style="width:100%; height:calc(100% - 44px); border:0;"></iframe>
+      </div>
+    </div>
+
+    <script>
+      function setMsg(s) {{
+        document.getElementById("msg").textContent = s;
+      }}
+
+      // Overlay controls
+      const overlay = document.getElementById("blobOverlay");
+      document.getElementById("openBlob").addEventListener("click", () => {{
+        overlay.style.display = "block";
+        overlay.setAttribute("aria-hidden", "false");
+      }});
+      document.getElementById("closeBlob").addEventListener("click", () => {{
+        overlay.style.display = "none";
+        overlay.setAttribute("aria-hidden", "true");
+      }});
+      overlay.addEventListener("click", (e) => {{
+        if (e.target === overlay) {{
+          overlay.style.display = "none";
+          overlay.setAttribute("aria-hidden", "true");
+        }}
+      }});
+    </script>
+  </body>
+</html>
+    """
+    return HTMLResponse(html)
+
+# kept for compatibility but no longer used by the UI flow
+@app.post("/set_blob")
+async def set_blob(req: Request):
+    try:
+        ctype = req.headers.get("content-type","")
+        if "application/json" in ctype:
+            data = await req.json()
+            txt = data.get("blob") if isinstance(data, dict) else None
+        else:
+            form = await req.form()
+            txt = form.get("blob")
+
+        if not isinstance(txt, str) or not txt.strip():
+            return JSONResponse({"error": "Missing 'blob' string"}, 400)
+
+        pathlib.Path(LOCAL_BLOB_PATH).write_text(txt, encoding="utf-8")
+        return JSONResponse({"ok": True, "path": LOCAL_BLOB_PATH})
+    except Exception as e:
+        return JSONResponse({"error": str(e)}, 500)