some more fixes

Author: deeleeramone

apps.json

@@ -110,8 +110,8 @@
             "i": "market_brief",
             "x": 0,
             "y": 12,
-            "w": 13,
-            "h": 20,
+            "w": 20,
+            "h": 24,
             "groups": [
               "Group 1",
               "Group 2",
@@ -120,10 +120,10 @@
           },
           {
             "i": "orderbook_ladder",
-            "x": 13,
+            "x": 20,
             "y": 12,
-            "w": 14,
-            "h": 20,
+            "w": 20,
+            "h": 24,
             "groups": [
               "Group 1",
               "Group 2",
@@ -132,10 +132,10 @@
           },
           {
             "i": "top_holders",
-            "x": 27,
-            "y": 12,
-            "w": 13,
-            "h": 20,
+            "x": 0,
+            "y": 36,
+            "w": 40,
+            "h": 16,
             "groups": [
               "Group 1",
               "Group 2",
@@ -145,7 +145,7 @@
           {
             "i": "selected_trades",
             "x": 0,
-            "y": 32,
+            "y": 52,
             "w": 40,
             "h": 12,
             "groups": [
@@ -233,4 +233,4 @@
       }
     ]
   }
-]
+]

openbb_polymarket/browse.py

@@ -71,11 +71,11 @@ def _event_html(
     sub = " · ".join(part for part in (escape(tags), close_html) if part)
     event_id = str(event.get("event_id") or "")
     market_key = str((event.get("outcomes") or [{}])[0].get("market_key") or "")
-    href = f"{base_url}/event_details?event_id={quote(event_id)}&theme={quote(theme)}"
+    href = f"{base_url}/browse_markets?view={quote(event_id)}"
     if market_key:
         href += f"&market_key={quote(market_key, safe='')}"
     if back_qs:
-        href += f"&back={quote(back_qs, safe='')}"
+        href += f"&{back_qs}"
     selected = " selected" if event_id and event_id == selected_event_id else ""
     return f"""
     <a class="event{selected}" href="{href}" data-event-id="{escape(event_id)}" data-market-key="{escape(market_key)}">

openbb_polymarket/event_page.py

@@ -81,6 +81,7 @@ def render_event_page(
     history_figure: dict[str, Any] | None = None,
     poll_url: str = "",
     market_key: str = "",
+    filters: dict[str, Any] | None = None,
 ) -> str:
     is_light = theme == "light"
     assets = base_url.rstrip("/")
@@ -91,15 +92,27 @@ def render_event_page(
     )
     figure_json = json.dumps(history_figure or {}).replace("</", "<\\/")
     cfg_json = json.dumps(
-        {"poll": poll_url, "event_id": event_id, "market_key": market_key}
+        {
+            "poll": poll_url,
+            "event_id": event_id,
+            "market_key": market_key,
+            "theme": theme,
+            "filters": filters or {},
+        }
     ).replace("</", "<\\/")
-    outcomes = sorted(
+    all_outcomes = sorted(
         (_outcome_row(m) for m in markets),
         key=lambda o: to_float(o["volume_total"]),
         reverse=True,
     )
-    total_volume = sum(o["volume_total"] for o in outcomes)
-    total_liquidity = sum(o["liquidity"] for o in outcomes)
+    total_volume = sum(o["volume_total"] for o in all_outcomes)
+    total_liquidity = sum(o["liquidity"] for o in all_outcomes)
+
+    def _active(outcome: dict[str, Any]) -> bool:
+        return to_float(outcome["volume_total"]) > 0 or to_float(outcome["liquidity"]) > 0
+
+    outcomes = [o for o in all_outcomes if _active(o)] or all_outcomes
+    hidden = len(all_outcomes) - len(outcomes)
     rep = markets[0] if markets else {}
     tags = ", ".join(
         str(t.get("slug") or t.get("label") or "")
@@ -110,14 +123,19 @@ def render_event_page(
     meta = " · ".join(
         part for part in (
             escape(tags),
-            f"{len(outcomes)} markets",
+            f"{len(outcomes)} of {len(all_outcomes)} markets" if hidden else f"{len(all_outcomes)} markets",
             f"${compact_number(total_volume)} volume",
             f"${compact_number(total_liquidity)} liquidity",
             (_time_el(event.get("endDate"), "ends ") if event.get("endDate") else ""),
         ) if part
     )
 
     rows = "".join(_outcome_html(o) for o in outcomes) or '<tr><td colspan="7" class="muted">No markets.</td></tr>'
+    if hidden:
+        rows += (
+            f'<tr><td colspan="7" class="muted" style="text-align:center;padding-top:12px">'
+            f"{hidden} inactive market{'s' if hidden != 1 else ''} hidden (no volume or liquidity)</td></tr>"
+        )
 
     resolution = ""
     if event.get("description"):

openbb_polymarket/routers/discover.py

@@ -197,7 +197,7 @@ async def _browse_cards(
         total = len(cards)
         cards = cards[max(0, offset): max(0, offset) + limit]
         for card in cards:
-            card["outcomes"] = sorted(card["outcomes"], key=lambda o: o["volume_total"], reverse=True)[:4]
+            card["outcomes"] = sorted(card["outcomes"], key=lambda o: o["probability_pct"], reverse=True)[:4]
         return cards, total
     return await stats.browse_events(
         tag=tag, close_within_days=_days(close_within), sort=sort,
@@ -214,6 +214,7 @@ async def browse_markets(
     close_within: str = Query(""),
     event_id: str = Query(""),
     market_key: str = Query(""),
+    view: str = Query(""),
     reverse: bool = Query(False),
     limit: int = Query(40, ge=1, le=150),
     offset: int = Query(0, ge=0),
@@ -234,6 +235,12 @@ async def browse_markets(
     }
     back_qs = urlencode({k: v for k, v in filters.items() if v and v != ALL})
 
+    if not raw and view.strip():
+        return await _event_detail_response(
+            request, service, event_id=view.strip(), market_key=market_key,
+            theme=theme, back=back_qs, filters=filters,
+        )
+
     cards, total = await _browse_cards(
         stats,
         service,
@@ -281,14 +288,15 @@ async def _event_figure(service: MarketDataService, resolved: dict[str, Any], th
     return charts.outcome_history(lines, theme) if lines else None
 
 
-@router.get("/event_details")
-async def event_details(
+async def _event_detail_response(
     request: Request,
-    event_id: str = Query(""),
-    market_key: str = Query(""),
-    theme: str = Query("dark"),
-    back: str = Query(""),
-    service: MarketDataService = Depends(get_service),
+    service: MarketDataService,
+    *,
+    event_id: str,
+    market_key: str,
+    theme: str,
+    back: str,
+    filters: dict[str, Any] | None = None,
 ) -> HTMLResponse:
     from openbb_polymarket.formatting import parse_market_key
 
@@ -306,10 +314,25 @@ async def event_details(
         history_figure=figure,
         poll_url=poll_url,
         market_key=market_key,
+        filters=filters or {},
     )
     return HTMLResponse(content=html)
 
 
+@router.get("/event_details")
+async def event_details(
+    request: Request,
+    event_id: str = Query(""),
+    market_key: str = Query(""),
+    theme: str = Query("dark"),
+    back: str = Query(""),
+    service: MarketDataService = Depends(get_service),
+) -> HTMLResponse:
+    return await _event_detail_response(
+        request, service, event_id=event_id, market_key=market_key, theme=theme, back=back,
+    )
+
+
 @router.get("/event_chart")
 async def event_chart(
     event_id: str = Query(""),

openbb_polymarket/routers/events.py

@@ -11,6 +11,7 @@
     compact_number,
     parse_market_key,
     timestamp_to_iso,
+    to_float,
 )
 from openbb_polymarket.service import MarketDataService, TOP_HISTORY_OUTCOME_COUNT
 from openbb_polymarket.stats import EventStatsCache, _outcome
@@ -96,6 +97,8 @@ async def event_outcomes(
         return []
     resolved = await service.resolve_event(event_id=event_id)
     rows = [market_row(m, resolved["event_id"]) for m in resolved["markets"]]
+    active = [r for r in rows if to_float(r["volume_total"]) > 0 or to_float(r["liquidity"]) > 0]
+    rows = active or rows
     rows.sort(key=lambda row: (row["volume_24h"], row["volume_total"], row["probability_pct"]), reverse=True)
     return [{field: row.get(field) for field in _OUTCOME_FIELDS} for row in rows]
 

openbb_polymarket/static/js/browse.js

@@ -117,14 +117,17 @@
   function intFmt(p) { return p.value == null ? "" : Number(p.value).toLocaleString(); }
   function pctFmt(p) { return p.value == null ? "" : Number(p.value).toFixed(0) + "%"; }
   function eventUrl(id, mk) {
-    var u = CFG.base + "/event_details?event_id=" + encodeURIComponent(id) + "&theme=" + encodeURIComponent(CFG.theme || "dark");
+    var u = CFG.base + "/browse_markets?view=" + encodeURIComponent(id);
     if (mk) u += "&market_key=" + encodeURIComponent(mk);
-    if (CFG.back) u += "&back=" + encodeURIComponent(CFG.back);
+    if (CFG.back) u += "&" + CFG.back;
     return u;
   }
+  function selectEvent(id, mk) {
+    emitWidgetParams({ event_id: id, market_key: mk || "", view: id });
+  }
   function selectAndOpen(id, mk) {
     if (!id) return;
-    emitWidgetParams({ event_id: id, market_key: mk || "" });
+    selectEvent(id, mk);
     window.location.href = eventUrl(id, mk);
   }
   function buildGrid() {
@@ -179,6 +182,6 @@
   document.addEventListener("click", function (event) {
     var a = event.target && event.target.closest ? event.target.closest("a.event[data-event-id]") : null;
     if (!a) return;
-    emitWidgetParams({ event_id: a.getAttribute("data-event-id"), market_key: a.getAttribute("data-market-key") || "" });
+    selectEvent(a.getAttribute("data-event-id"), a.getAttribute("data-market-key") || "");
   });
 })();

openbb_polymarket/static/js/event_page.js

@@ -5,6 +5,58 @@
     catch (e) { return fallback; }
   }
   var EVCFG = readJson("ev-cfg", {});
+  var FILTERS = EVCFG.filters || {};
+  var FILTER_KEYS = ["tag", "search", "sort", "close_within", "reverse", "limit", "offset"];
+  var host = window.top || window.parent;
+
+  function emit(params) {
+    if (host !== window) host.postMessage({ type: "openbb:widget-params:update", params: params }, "*");
+  }
+
+  function listUrl(overrides) {
+    var qs = new URLSearchParams();
+    FILTER_KEYS.forEach(function (k) {
+      var v = overrides && overrides[k] != null ? overrides[k] : FILTERS[k];
+      if (v != null && String(v) !== "") qs.set(k, String(v));
+    });
+    if (EVCFG.theme) qs.set("theme", EVCFG.theme);
+    return "/browse_markets?" + qs.toString();
+  }
+
+  if (EVCFG.event_id) {
+    emit({ event_id: EVCFG.event_id, market_key: EVCFG.market_key || "", view: EVCFG.event_id });
+  }
+
+  var backLink = document.querySelector("a.back");
+  if (backLink) {
+    backLink.addEventListener("click", function () { emit({ view: "" }); });
+  }
+
+  window.addEventListener("message", function (event) {
+    var d = event.data;
+    if (!d || typeof d !== "object" || d.type !== "openbb-params-update") return;
+    var raw = d.params || d.payload || d.data || d.values || {};
+    var incoming = {};
+    if (Array.isArray(raw)) {
+      raw.forEach(function (p) { incoming[p.paramName || p.name] = p.value; });
+    } else {
+      Object.keys(raw).forEach(function (k) {
+        var v = raw[k];
+        incoming[k] = (v && typeof v === "object" && "value" in v) ? v.value : v;
+      });
+    }
+    var overrides = {}, changed = false;
+    FILTER_KEYS.forEach(function (k) {
+      if (incoming[k] == null) return;
+      var s = String(incoming[k]);
+      if (s !== String(FILTERS[k] == null ? "" : FILTERS[k])) { overrides[k] = s; changed = true; }
+    });
+    if (changed) {
+      emit({ view: "" });
+      window.location.href = listUrl(overrides);
+    }
+  });
+
   document.querySelectorAll(".ts-d").forEach(function (el) {
     var ms = Number(el.getAttribute("data-ts")); if (!ms) return;
     el.textContent = (el.getAttribute("data-prefix") || "")

openbb_polymarket/stats.py

@@ -330,7 +330,7 @@ async def browse_events(
         cards = []
         for event in page:
             outcomes = sorted(
-                event["outcomes"], key=lambda o: to_float(o["volume_total"]), reverse=True
+                event["outcomes"], key=lambda o: to_float(o["probability_pct"]), reverse=True
             )[:outcomes_per_event]
             cards.append({**event, "outcomes": outcomes})
         return cards, total

widgets.json

@@ -207,6 +207,14 @@
           "event_id": "$event_id",
           "market_key": "$market_key"
         }
+      },
+      {
+        "paramName": "view",
+        "type": "text",
+        "label": "View",
+        "description": "Event the browser is currently showing. Set only by clicking a card; never grouped, so an event selected elsewhere cannot redirect the browser.",
+        "value": "",
+        "show": false
       }
     ],
     "storage": {
@@ -1169,4 +1177,4 @@
       }
     }
   }
-}
+}