Update app.py

app.py

@@ -1,162 +1,71 @@
-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,
-    )
-    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"])
+import os, asyncio, httpx, websockets
+from fastapi import FastAPI, Request, WebSocket, WebSocketDisconnect
+from fastapi.responses import StreamingResponse, PlainTextResponse
+
+UPSTREAM = os.getenv("UPSTREAM", "https://cjerzak-policyview.hf.space").rstrip("/")
+TOKEN = os.getenv("HF_TOKEN")
+if not TOKEN:
+    raise RuntimeError("Set HF_TOKEN as a Secret in the Space settings.")
+
+app = FastAPI()
+
+@app.get("/healthz")
+def healthz():
+    return PlainTextResponse("ok")
+
+async def stream_bytes(resp):
+    async for chunk in resp.aiter_bytes():
+        yield chunk
+
+@app.api_route("/{path:path}", methods=["GET","POST","PUT","PATCH","DELETE","OPTIONS"])
+async def proxy(request: Request, path: str):
+    url = f"{UPSTREAM}/{path}"
+    if request.url.query:
+        url += f"?{request.url.query}"
+    headers = {k: v for k, v in request.headers.items()
+               if k.lower() not in ("host", "content-length", "authorization")}
+    headers["Authorization"] = f"Bearer {TOKEN}"
+    headers["x-forwarded-host"] = request.headers.get("host", "")
+    headers["x-forwarded-proto"] = request.url.scheme
+    async with httpx.AsyncClient(follow_redirects=False, timeout=httpx.Timeout(60.0, connect=60.0)) as client:
+        upstream = await client.request(
+            request.method, url, headers=headers, content=await request.body(), stream=True
+        )
+        # Strip hop-by-hop headers and rewrite redirects back through this proxy
+        drop = {"content-length","transfer-encoding","connection","keep-alive",
+                "proxy-authenticate","proxy-authorization","te","trailers","upgrade","set-cookie"}
+        out_headers = {k: v for k, v in upstream.headers.items() if k.lower() not in drop}
+        loc = upstream.headers.get("location")
+        if loc and loc.startswith(UPSTREAM):
+            out_headers["location"] = loc.replace(UPSTREAM, "")
+        return StreamingResponse(stream_bytes(upstream), status_code=upstream.status_code, headers=out_headers)
+
+@app.websocket("/{path:path}")
+async def ws_proxy(ws: WebSocket, path: str):
+    await ws.accept()
+    target = f"{UPSTREAM}/{path}"
+    if ws.url.query:
+        target += f"?{ws.url.query}"
+    ws_headers = [("Authorization", f"Bearer {TOKEN}")]
+    # Upgrade to wss for https upstream
+    target = target.replace("https://", "wss://").replace("http://", "ws://")
+    try:
+        async with websockets.connect(target, extra_headers=ws_headers, origin=UPSTREAM) as ups:
+            async def client_to_up():
+                while True:
+                    msg = await ws.receive()
+                    data = msg.get("text") if "text" in msg else msg.get("bytes")
+                    if data is None: break
+                    await ups.send(data)
+            async def up_to_client():
+                while True:
+                    data = await ups.recv()
+                    if isinstance(data, (bytes, bytearray)):
+                        await ws.send_bytes(data)
+                    else:
+                        await ws.send_text(data)
+            await asyncio.gather(client_to_up(), up_to_client())
+    except WebSocketDisconnect:
+        pass
+    except Exception:
+        await ws.close()