feat(DISPLAY-001): add underlying mode switching
This commit is contained in:
@@ -5,6 +5,7 @@ import logging
|
||||
from fastapi.responses import RedirectResponse
|
||||
from nicegui import ui
|
||||
|
||||
from app.domain.conversions import collateral_to_display_units, format_display_quantity, get_display_mode_label
|
||||
from app.domain.portfolio_math import resolve_portfolio_spot_from_quote
|
||||
from app.models.workspace import get_workspace_repository
|
||||
from app.pages.common import (
|
||||
@@ -121,16 +122,25 @@ async def _render_hedge_page(workspace_id: str | None = None) -> None:
|
||||
)
|
||||
updated_label = f"Quote timestamp: {quote_updated_at}" if quote_updated_at else "Quote timestamp: unavailable"
|
||||
|
||||
# Get underlying for display
|
||||
# Get underlying and display mode for display
|
||||
underlying = "GLD"
|
||||
display_mode = "GLD"
|
||||
display_label = "GLD Shares"
|
||||
if workspace_id:
|
||||
try:
|
||||
repo = get_workspace_repository()
|
||||
config = repo.load_portfolio_config(workspace_id)
|
||||
underlying = config.underlying or "GLD"
|
||||
display_mode = config.display_mode or "GLD"
|
||||
display_label = get_display_mode_label(display_mode)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Compute display unit values
|
||||
collateral_qty, collateral_unit = collateral_to_display_units(
|
||||
float(portfolio.get("gold_units", 0.0)), display_mode
|
||||
)
|
||||
|
||||
with dashboard_page(
|
||||
"Hedge Analysis",
|
||||
f"Compare hedge structures across scenarios, visualize cost-benefit tradeoffs, and inspect net equity impacts for {underlying}.",
|
||||
@@ -138,7 +148,10 @@ async def _render_hedge_page(workspace_id: str | None = None) -> None:
|
||||
workspace_id=workspace_id,
|
||||
):
|
||||
with ui.row().classes("w-full items-center justify-between gap-4 max-md:flex-col max-md:items-start"):
|
||||
ui.label(f"Active underlying: {underlying}").classes("text-sm text-slate-500 dark:text-slate-400")
|
||||
ui.label(
|
||||
f"Active underlying: {underlying} · Display mode: {display_label} · "
|
||||
f"Collateral: {format_display_quantity(collateral_qty, collateral_unit)} {collateral_unit}"
|
||||
).classes("text-sm text-slate-500 dark:text-slate-400")
|
||||
|
||||
left_pane, right_pane = split_page_panes(
|
||||
left_testid="hedge-left-pane",
|
||||
@@ -249,11 +262,15 @@ async def _render_hedge_page(workspace_id: str | None = None) -> None:
|
||||
"text-sm text-slate-500 dark:text-slate-400"
|
||||
)
|
||||
ui.label(strategy["description"]).classes("text-sm text-slate-600 dark:text-slate-300")
|
||||
# Compute display unit values for summary
|
||||
collateral_qty, collateral_unit = collateral_to_display_units(
|
||||
float(portfolio.get("gold_units", 0.0)), display_mode
|
||||
)
|
||||
with ui.grid(columns=1).classes("w-full gap-4 sm:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2"):
|
||||
cards = [
|
||||
("Start value", f"${portfolio['gold_value']:,.0f}"),
|
||||
("Start price", f"${portfolio['spot_price']:,.2f}/oz"),
|
||||
("Weight", f"{portfolio['gold_units']:,.0f} oz"),
|
||||
("Weight", f"{format_display_quantity(collateral_qty, collateral_unit)} {collateral_unit}"),
|
||||
("Loan amount", f"${portfolio['loan_amount']:,.0f}"),
|
||||
("Margin call LTV", f"{portfolio['margin_call_ltv']:.1%}"),
|
||||
("Monthly hedge budget", f"${portfolio['hedge_budget']:,.0f}"),
|
||||
|
||||
@@ -8,6 +8,7 @@ from fastapi.responses import RedirectResponse
|
||||
from nicegui import ui
|
||||
|
||||
from app.components import PortfolioOverview
|
||||
from app.domain.conversions import collateral_to_display_units, format_display_quantity, get_display_mode_label
|
||||
from app.domain.portfolio_math import resolve_portfolio_spot_from_quote
|
||||
from app.models.ltv_history import LtvHistoryRepository
|
||||
from app.models.workspace import WORKSPACE_COOKIE, get_workspace_repository
|
||||
@@ -198,6 +199,13 @@ async def overview_page(workspace_id: str) -> None:
|
||||
else "Configured entry price fallback in USD/ozt"
|
||||
)
|
||||
|
||||
# Compute display mode values
|
||||
display_mode = config.display_mode or "GLD"
|
||||
display_label = get_display_mode_label(display_mode)
|
||||
collateral_display_qty, collateral_display_unit = collateral_to_display_units(
|
||||
float(config.gold_ounces or 0.0), display_mode
|
||||
)
|
||||
|
||||
with dashboard_page(
|
||||
"Overview",
|
||||
f"Portfolio health, LTV risk, and quick strategy guidance for the current {underlying}-backed loan.",
|
||||
@@ -207,7 +215,9 @@ async def overview_page(workspace_id: str) -> None:
|
||||
with ui.row().classes("w-full items-center justify-between gap-4 max-md:flex-col max-md:items-start"):
|
||||
ui.label(quote_status).classes("text-sm text-slate-500 dark:text-slate-400")
|
||||
ui.label(
|
||||
f"Active underlying: {underlying} · Configured collateral baseline: ${config.gold_value:,.0f} · Loan ${config.loan_amount:,.0f}"
|
||||
f"Active underlying: {underlying} · Display mode: {display_label} · "
|
||||
f"Collateral: {format_display_quantity(collateral_display_qty, collateral_display_unit)} {collateral_display_unit} · "
|
||||
f"Loan ${config.loan_amount:,.0f}"
|
||||
).classes("text-sm text-slate-500 dark:text-slate-400")
|
||||
|
||||
left_pane, right_pane = split_page_panes(
|
||||
@@ -312,15 +322,24 @@ async def overview_page(workspace_id: str) -> None:
|
||||
):
|
||||
ui.label("Portfolio Snapshot").classes("text-lg font-semibold text-slate-900 dark:text-slate-100")
|
||||
with ui.grid(columns=1).classes("w-full gap-4 sm:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2"):
|
||||
# Compute display unit values for snapshot
|
||||
collateral_qty, collateral_unit = collateral_to_display_units(
|
||||
float(portfolio["gold_units"]), display_mode
|
||||
)
|
||||
summary_cards = [
|
||||
(
|
||||
"Collateral Spot Price",
|
||||
f"${portfolio['spot_price']:,.2f}",
|
||||
f"${portfolio['spot_price']:,.2f}/oz",
|
||||
spot_caption,
|
||||
),
|
||||
(
|
||||
"Collateral Amount",
|
||||
f"{format_display_quantity(collateral_qty, collateral_unit)} {collateral_unit}",
|
||||
f"Gold collateral in {display_label.lower()}",
|
||||
),
|
||||
(
|
||||
"Margin Call Price",
|
||||
f"${portfolio['margin_call_price']:,.2f}",
|
||||
f"${portfolio['margin_call_price']:,.2f}/oz",
|
||||
"Implied trigger level from persisted portfolio settings",
|
||||
),
|
||||
(
|
||||
|
||||
@@ -8,6 +8,7 @@ from uuid import uuid4
|
||||
from fastapi.responses import RedirectResponse
|
||||
from nicegui import ui
|
||||
|
||||
from app.domain.conversions import get_display_mode_options
|
||||
from app.models.portfolio import PortfolioConfig
|
||||
from app.models.position import Position
|
||||
from app.models.workspace import get_workspace_repository
|
||||
@@ -126,6 +127,7 @@ def settings_page(workspace_id: str) -> None:
|
||||
fallback_source=str(fallback_source.value),
|
||||
refresh_interval=parsed_refresh_interval,
|
||||
underlying=str(underlying.value),
|
||||
display_mode=str(display_mode.value),
|
||||
volatility_spike=float(vol_alert.value),
|
||||
spot_drawdown=float(price_alert.value),
|
||||
email_alerts=bool(email_alerts.value),
|
||||
@@ -257,6 +259,16 @@ def settings_page(workspace_id: str) -> None:
|
||||
value=config.underlying,
|
||||
label="Underlying instrument",
|
||||
).classes("w-full")
|
||||
|
||||
display_mode = ui.select(
|
||||
get_display_mode_options(),
|
||||
value=config.display_mode,
|
||||
label="Display Mode",
|
||||
).classes("w-full")
|
||||
ui.label("Choose how to display positions and collateral values.").classes(
|
||||
"text-xs text-slate-500 dark:text-slate-400 -mt-2"
|
||||
)
|
||||
|
||||
primary_source = ui.select(
|
||||
["yfinance", "ibkr", "alpaca"],
|
||||
value=config.primary_source,
|
||||
@@ -609,6 +621,7 @@ def settings_page(workspace_id: str) -> None:
|
||||
primary_source,
|
||||
fallback_source,
|
||||
refresh_interval,
|
||||
display_mode,
|
||||
):
|
||||
element.on_value_change(update_calculations)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user