Compare commits

..
14 Commits
Author SHA1 Message Date
matitos 9d6028fbbf Add the Williams %R strategy
CI/CD / backend (push) Successful in 9m58s
CI/CD / frontend (push) Successful in 9m32s
CI/CD / build (push) Successful in 30s
CI/CD / cleanup (push) Successful in 5s
CI/CD / deploy (push) Successful in 34s
2026-09-26 18:44:00 +00:00
matitos d92f152f9b Add the Williams %R strategy
New williams_r indicator (in [-100, 0]) exposed as ctx.williams_r(period), and a
long-only mean-reversion strategy: enter when %R is at/below the oversold level,
exit when it reaches the overbought level, with an optional ATR stop. 11
strategies total. Adds indicator and strategy tests; smoke-tested on live
BTC/USDT 5m (backtest + parameter sweep).
2026-09-26 18:44:00 +00:00
matitos ef895b6b9c Aggregate the top status cards across strategies
CI/CD / backend (push) Successful in 9m59s
CI/CD / frontend (push) Successful in 9m32s
CI/CD / build (push) Successful in 20s
CI/CD / cleanup (push) Successful in 5s
CI/CD / deploy (push) Successful in 1m8s
2026-09-22 23:11:19 +00:00
matitos 57dcfe7adb Aggregate the top status cards across strategies
With several strategies the header cards showed only the first one. Expose
day_pnl and drawdown_pct per strategy and add aggregateStatus() (frontend) so the
cards show the whole account: summed cash/equity/P&L/trades/positions, worst
drawdown, and any halt. Single-strategy runs are unchanged. Adds tests.
2026-09-22 23:11:18 +00:00
matitos 657c473e82 Merge the single and multi strategy panels into one
CI/CD / backend (push) Successful in 10m2s
CI/CD / frontend (push) Successful in 9m31s
CI/CD / build (push) Successful in 15s
CI/CD / cleanup (push) Successful in 5s
CI/CD / deploy (push) Successful in 33s
2026-09-22 17:57:10 +00:00
matitos 50b22df948 Merge the single and multi strategy panels into one
The single "Strategy" panel and "Strategies (multi)" were redundant: the multi
panel with one row is exactly the single-strategy behaviour. Remove StrategyPanel
and make "Strategies" the one trading panel. Presets move into it (load adds a
row, per-row Save), and the header now reports "N strategies" when several run
instead of only the first. Deletes the obsolete component and its test; adds
preset tests to the multi-strategy suite.
2026-09-22 17:57:10 +00:00
matitos d4d864dc5c Observability: Prometheus metrics, log panel, runbook
CI/CD / backend (push) Successful in 9m56s
CI/CD / frontend (push) Successful in 9m31s
CI/CD / build (push) Successful in 19s
CI/CD / cleanup (push) Successful in 6s
CI/CD / deploy (push) Successful in 42s
2026-09-22 17:10:39 +00:00
matitos ac92dd5ac4 Observability: Prometheus metrics, log panel, runbook
- GET /api/metrics renders Prometheus text (equity, P&L, per-strategy
  equity/pnl/allocation/halted, info) with no client library.
- In-memory ring log handler (app/logs.py) exposed at GET /api/logs and a
  dashboard "Server logs" panel; Runtime mirrors bot events into the logger.
- docs/runbook.md covers deploys, the kill switch, resetting paper state and
  going live. Adds tests for metrics rendering and the log ring.
2026-09-22 17:10:38 +00:00
matitos c605a0f316 Add Supertrend and VWAP strategies plus a short-side example
CI/CD / backend (push) Successful in 5m49s
CI/CD / frontend (push) Successful in 5m19s
CI/CD / build (push) Successful in 14s
CI/CD / cleanup (push) Successful in 7s
CI/CD / deploy (push) Successful in 1m1s
2026-09-22 14:14:13 +00:00
matitos d1f66c95c4 Add Supertrend and VWAP strategies plus a short-side example
- New indicators: vwap (rolling/cumulative) and supertrend (line + direction),
  exposed on StrategyContext.
- New strategies: supertrend (flip-based, optional shorts), vwap_reversion
  (mean reversion below a rolling VWAP) and ema_cross_short (short-side
  example, mirroring the long EMA cross). 10 strategies total.
- Adds indicator and strategy tests; smoke-tested all three on live BTC/USDT
  5m data.
2026-09-22 14:14:12 +00:00
matitos c1a7fb9c6b Notification upgrades: lifecycle, configurable levels, summaries
CI/CD / backend (push) Successful in 6m14s
CI/CD / frontend (push) Successful in 5m7s
CI/CD / build (push) Successful in 18s
CI/CD / cleanup (push) Successful in 6s
CI/CD / deploy (push) Successful in 1m26s
2026-09-22 13:18:04 +00:00
matitos 2ca5032e7e Notification upgrades: lifecycle, configurable levels, summaries
- NOTIFY_LEVELS chooses which event levels are sent (default trade,error).
- NOTIFY_LIFECYCLE sends explicit start/stop messages; the kill switch always
  notifies at error level.
- SUMMARY_INTERVAL_MINUTES sends a periodic portfolio summary (equity, per
  strategy P&L, allocation, halted state) via a background task started with
  the run and stopped on stop/kill/shutdown.
- Wires the new vars plus the go-live vars through both compose files and the
  deploy workflow. Adds tests.
2026-09-22 13:18:02 +00:00
matitos ef3e6f346c Go-live gate: refuse unsafe live trading
CI/CD / backend (push) Successful in 6m9s
CI/CD / frontend (push) Successful in 5m14s
CI/CD / build (push) Successful in 22s
CI/CD / cleanup (push) Successful in 6s
CI/CD / deploy (push) Successful in 39s
2026-09-22 12:55:13 +00:00
matitos 0173e46cfb Go-live gate: refuse unsafe live trading
Setting MODE=live alone no longer starts trading. check_live_ready requires an
active risk limit, MAX_POSITION_PCT < 1.0, LIVE_CONFIRMATION exactly
"I UNDERSTAND THE RISK", a minimum balance, and exchange credentials. Enforced
in Runtime.start_many (both start paths) and surfaced at GET /api/live-check;
the dashboard shows a banner and blocks the start buttons. Adds tests.
2026-09-22 12:55:12 +00:00
38 changed files with 1741 additions and 183 deletions

No files matched your search

+13
View File
@@ -33,6 +33,13 @@ EXCHANGE_API_SECRET=
# Set true for testnet/sandbox where supported
EXCHANGE_SANDBOX=false
# --- Go-live gate (required for MODE=live) ---
# Live trading only starts when this is exactly "I UNDERSTAND THE RISK".
# Setting MODE=live alone is intentionally not enough.
LIVE_CONFIRMATION=
# Refuse to start live below this account size (quote currency).
MIN_LIVE_BALANCE=100
# --- Risk controls (0 disables a limit) ---
# Halt + flatten if the day's loss reaches this amount in quote currency
MAX_DAILY_LOSS=0
@@ -58,6 +65,12 @@ TELEGRAM_BOT_TOKEN=
TELEGRAM_CHAT_ID=
# Generic webhook: receives POST {"level": "...", "text": "..."}
NOTIFY_WEBHOOK_URL=
# Event levels to notify on (comma separated): trade, error, warning, info.
NOTIFY_LEVELS=trade,error
# Send explicit start/stop messages.
NOTIFY_LIFECYCLE=true
# Periodic portfolio summary every N minutes (0 disables).
SUMMARY_INTERVAL_MINUTES=0
# --- Web ---
# Comma separated list, or * in dev
+5
View File
@@ -125,6 +125,11 @@ jobs:
CRYPTO_TELEGRAM_BOT_TOKEN: ${{ secrets.CRYPTO_TELEGRAM_BOT_TOKEN }}
CRYPTO_TELEGRAM_CHAT_ID: ${{ vars.CRYPTO_TELEGRAM_CHAT_ID || secrets.CRYPTO_TELEGRAM_CHAT_ID }}
CRYPTO_NOTIFY_WEBHOOK_URL: ${{ secrets.CRYPTO_NOTIFY_WEBHOOK_URL }}
CRYPTO_NOTIFY_LEVELS: ${{ vars.CRYPTO_NOTIFY_LEVELS || 'trade,error' }}
CRYPTO_NOTIFY_LIFECYCLE: ${{ vars.CRYPTO_NOTIFY_LIFECYCLE || 'true' }}
CRYPTO_SUMMARY_INTERVAL_MINUTES: ${{ vars.CRYPTO_SUMMARY_INTERVAL_MINUTES || '0' }}
CRYPTO_LIVE_CONFIRMATION: ${{ secrets.CRYPTO_LIVE_CONFIRMATION }}
CRYPTO_MIN_LIVE_BALANCE: ${{ vars.CRYPTO_MIN_LIVE_BALANCE || '100' }}
# Optional API bearer token (injected server-side by the frontend nginx).
CRYPTO_API_TOKEN: ${{ secrets.CRYPTO_API_TOKEN }}
CRYPTO_API_TOKEN_HEADER: ${{ vars.CRYPTO_API_TOKEN_HEADER || 'X-API-Token' }}
+21 -1
View File
@@ -92,7 +92,7 @@ class MyStrategy(Strategy):
| --- | --- |
| Price / candles | `ctx.price`, `ctx.candles`, `ctx.closes`, `ctx.high(n)`, `ctx.low(n)` |
| Portfolio | `ctx.is_flat`, `ctx.side`, `ctx.position`, `ctx.equity`, `ctx.cash` |
| Indicators | `ctx.sma(p)`, `ctx.ema(p)`, `ctx.rsi(p)`, `ctx.atr(p)`, `ctx.std(p)` |
| Indicators | `ctx.sma(p)`, `ctx.ema(p)`, `ctx.rsi(p)`, `ctx.atr(p)`, `ctx.std(p)`, `ctx.macd()`, `ctx.roc(p)`, `ctx.vwap(p)`, `ctx.supertrend(p, mult)`, `ctx.williams_r(p)` |
| Orders | `ctx.enter_long(size, stop_loss, take_profit, trailing_stop_pct, reason)`, `ctx.enter_short(...)`, `ctx.close(reason)` |
Notes:
@@ -127,6 +127,26 @@ candles you control and asserts the emitted intents. See
- Portfolio invariant: `equity = cash ± qty * mark`, realized P&L accumulates on
close, and every order/equity point/event is persisted.
## Go-live gate
`app/engine/live_guard.py` (`check_live_ready`) is the single place that decides
whether live trading may start. It is enforced in `Runtime.start_many` (so both
the single and multi start paths are covered) and surfaced via
`GET /api/live-check`. Never bypass it: if you add a new way to start trading,
call `check_live_ready` first. `LIVE_CONFIRMATION` must equal
`"I UNDERSTAND THE RISK"` — keep it a phrase, not a boolean.
## Observability
- `app/metrics.py` renders Prometheus text at `GET /api/metrics` straight from
the manager status — no client library. Keep new series out of hot loops.
- `app/logs.py` keeps a small in-memory ring of log records, exposed at
`GET /api/logs` and shown in the dashboard. `Runtime._log_event` mirrors bot
events into the logger so the panel is useful (uvicorn's own loggers do not
propagate to the root handler).
- `docs/runbook.md` is the operations guide; update it when deploy or
recovery steps change.
## Risk controls & notifications
- `app/engine/risk.py` (`RiskManager`) tracks daily loss, drawdown, position cap
+41 -1
View File
@@ -144,6 +144,22 @@ injects it on the handshake). If `API_TOKEN` is unset, `/api/ws` is as open as
the rest of `/api`, which is fine for a trusted/private deployment but is the
reason to set a token if the host is exposed.
## Going live
Setting `MODE=live` alone is **not** enough. `GET /api/live-check` (and the
dashboard banner) validate a preflight before any live order can be placed; live
trading is blocked unless *all* of these hold:
- at least one risk limit is active (`MAX_DAILY_LOSS`, `MAX_DRAWDOWN_PCT` or
`MAX_TRADES_PER_DAY`);
- `MAX_POSITION_PCT < 1.0` (a single position can never be the whole account);
- `LIVE_CONFIRMATION` is exactly `I UNDERSTAND THE RISK`;
- the starting balance is at least `MIN_LIVE_BALANCE`;
- exchange API credentials are set.
A blocked live start returns `400` with the reasons, and the dashboard shows a
banner listing them. Practise the kill switch in paper mode first.
## Multi-strategy
The **Strategies (multi)** panel runs several strategies at once, each with its
@@ -175,6 +191,15 @@ best-effort: a failing channel never affects trading. For Telegram, create a bot
with [@BotFather](https://t.me/BotFather), message it once, then read the chat id
from `https://api.telegram.org/bot<token>/getUpdates`.
Additional controls:
- `NOTIFY_LEVELS` (default `trade,error`) — which event levels to send; add
`warning` or `info`.
- `NOTIFY_LIFECYCLE` (default `true`) — explicit start/stop messages; the kill
switch always notifies.
- `SUMMARY_INTERVAL_MINUTES` (default `0`) — periodic portfolio summary (equity,
per-strategy P&L and allocation).
## Adding a strategy
Drop a file in `backend/app/engine/strategies/` — it is auto-discovered and
@@ -182,7 +207,9 @@ appears in the UI immediately. See **[AGENTS.md](AGENTS.md)** for the full
template and the `StrategyContext` API.
Bundled strategies: `sma_cross`, `ema_cross`, `macd_trend`,
`bollinger_reversion`, `donchian_breakout`, `momentum`, `rsi_reversion`.
`bollinger_reversion`, `donchian_breakout`, `momentum`, `rsi_reversion`,
`supertrend`, `vwap_reversion`, `ema_cross_short` (short-side example),
`williams_r`.
## API
@@ -193,6 +220,9 @@ Bundled strategies: `sma_cross`, `ema_cross`, `macd_trend`,
| `POST` | `/api/bot/start` | Start a strategy |
| `POST` | `/api/bot/start-many` | Start several strategies with per-strategy allocations |
| `GET` | `/api/bot/status` | Per-strategy status for a multi-strategy run |
| `GET` | `/api/live-check` | Go-live preflight (blockers for live trading) |
| `GET` | `/api/metrics` | Prometheus text exposition |
| `GET` | `/api/logs` | Recent backend log lines (in-memory ring) |
| `POST` | `/api/bot/stop` | Stop the bot |
| `POST` | `/api/bot/kill` | Kill switch: flatten + halt |
| `POST` | `/api/backtest` | Backtest a strategy on historical candles |
@@ -207,6 +237,16 @@ Bundled strategies: `sma_cross`, `ema_cross`, `macd_trend`,
| `DELETE` | `/api/presets/{id}` | Delete a preset |
| `WS` | `/api/ws` | Live status + event stream |
## Observability
- `GET /api/metrics` exposes Prometheus metrics (`crypto_equity`,
`crypto_total_pnl`, per-strategy `crypto_strategy_equity`/`_pnl`/`_allocation`/
`_halted`, `crypto_info`). Point the existing Prometheus scrape at it.
- The dashboard's **Server logs** panel shows recent backend log lines
(in-memory ring buffer), useful alongside **Activity**.
- See [docs/runbook.md](docs/runbook.md) for operations (deploys, kill switch,
resetting paper state, going live).
## Tests & lint
```bash
+32 -1
View File
@@ -4,10 +4,20 @@ import asyncio
from typing import Annotated
import httpx
from fastapi import APIRouter, Depends, HTTPException, Request, WebSocket, WebSocketDisconnect
from fastapi import (
APIRouter,
Depends,
HTTPException,
Request,
Response,
WebSocket,
WebSocketDisconnect,
)
from app.config import Settings
from app.engine.strategies import get_strategy, list_strategies, strategy_spec
from app.logs import get_log_handler
from app.metrics import render_metrics
from app.models import OrderSide, Position, PositionStatus
from app.runtime import Runtime
from app.schemas import (
@@ -65,6 +75,21 @@ def health() -> dict[str, str]:
return {"status": "ok"}
@router.get("/metrics")
def metrics(runtime: GuardedRuntimeDep) -> Response:
"""Prometheus text exposition, unauthenticated so a scraper can reach it."""
status = runtime.multi_status()
body = render_metrics(status, runtime.settings.mode, runtime.settings.exchange)
return Response(content=body, media_type="text/plain; version=0.0.4")
@router.get("/logs")
def logs(runtime: GuardedRuntimeDep, limit: int = 100) -> dict:
handler = get_log_handler()
entries = handler.snapshot(limit) if handler is not None else []
return {"entries": entries}
@router.get("/version")
def version(request: Request) -> dict[str, str]:
"""Build version of the running backend, used by the client to self-heal
@@ -103,6 +128,12 @@ def multi_status(runtime: GuardedRuntimeDep) -> MultiStatusOut:
return runtime.multi_status()
@router.get("/live-check")
def live_check(runtime: GuardedRuntimeDep) -> dict:
"""Preflight for live trading: whether the config is safe enough."""
return runtime.live_check()
@router.post("/bot/start-many", response_model=MultiStatusOut)
async def start_many(payload: StartManyRequest, runtime: GuardedRuntimeDep) -> MultiStatusOut:
try:
+18
View File
@@ -39,6 +39,13 @@ class Settings(BaseSettings):
exchange_api_secret: str = ""
exchange_sandbox: bool = False
# --- Go-live gate ---
# Live trading only starts when this is exactly "I UNDERSTAND THE RISK".
# It is deliberately not a boolean: setting MODE=live alone is not enough.
live_confirmation: str = ""
# Refuse to start live below this account size (quote currency).
min_live_balance: float = 100.0
# --- Risk controls (0 disables a limit) ---
# Absolute loss in quote currency since the start of the UTC day.
max_daily_loss: float = 0.0
@@ -53,6 +60,13 @@ class Settings(BaseSettings):
telegram_bot_token: str = ""
telegram_chat_id: str = ""
notify_webhook_url: str = ""
# Event levels to notify on. Defaults to trades and errors; add "info" to
# include start/stop messages, or "warning" for blocked entries.
notify_levels: str = "trade,error"
# Explicit start/stop lifecycle messages (separate from event levels).
notify_lifecycle: bool = True
# Periodic portfolio summary, in minutes (0 disables).
summary_interval_minutes: int = 0
# Optional bearer token required on /api requests (defense-in-depth behind
# the Traefik Basic auth). Empty disables the check.
@@ -73,6 +87,10 @@ class Settings(BaseSettings):
def cors_origin_list(self) -> list[str]:
return [origin.strip() for origin in self.cors_origins.split(",") if origin.strip()]
@property
def notify_level_set(self) -> set[str]:
return {level.strip().lower() for level in self.notify_levels.split(",") if level.strip()}
@property
def is_live(self) -> bool:
return self.mode == "live"
+97
View File
@@ -151,6 +151,103 @@ def roc(values: Sequence[float], period: int = 10) -> list[Number]:
return out
def williams_r(candles: Sequence[Candle], period: int = 14) -> list[Number]:
"""Williams %R, in [-100, 0]. Below -80 is oversold, above -20 overbought."""
if period <= 0:
raise ValueError("period must be positive")
out: list[Number] = [None] * len(candles)
for i in range(period - 1, len(candles)):
window = candles[i - period + 1 : i + 1]
highest = max(candle.high for candle in window)
lowest = min(candle.low for candle in window)
if highest == lowest:
out[i] = -50.0
else:
out[i] = (highest - candles[i].close) / (highest - lowest) * -100
return out
def typical_price(candle: Candle) -> float:
return (candle.high + candle.low + candle.close) / 3
def vwap(candles: Sequence[Candle], period: int | None = None) -> list[Number]:
"""Volume-weighted average price, rolling over ``period`` bars.
With ``period=None`` it is cumulative from the first candle.
"""
out: list[Number] = [None] * len(candles)
pv_sum = 0.0
volume_sum = 0.0
window: list[tuple[float, float]] = []
for i, candle in enumerate(candles):
price = typical_price(candle)
volume = candle.volume
pv_sum += price * volume
volume_sum += volume
if period is not None:
window.append((price, volume))
if len(window) > period:
old_price, old_volume = window.pop(0)
pv_sum -= old_price * old_volume
volume_sum -= old_volume
if len(window) < period:
continue
if volume_sum:
out[i] = pv_sum / volume_sum
return out
def supertrend(
candles: Sequence[Candle],
period: int = 10,
multiplier: float = 3.0,
) -> tuple[list[float | None], list[bool | None]]:
"""Supertrend line and trend direction (True = uptrend) per candle."""
atr_series = atr(candles, period)
line: list[float | None] = [None] * len(candles)
up: list[bool | None] = [None] * len(candles)
final_upper: float | None = None
final_lower: float | None = None
prev_close: float | None = None
direction_up = True
for i, candle in enumerate(candles):
atr_value = atr_series[i]
if atr_value is None:
continue
midpoint = (candle.high + candle.low) / 2
basic_upper = midpoint + multiplier * atr_value
basic_lower = midpoint - multiplier * atr_value
if final_upper is None or final_lower is None:
final_upper, final_lower = basic_upper, basic_lower
direction_up = candle.close >= midpoint
else:
assert prev_close is not None
final_upper = (
basic_upper
if basic_upper < final_upper or prev_close > final_upper
else final_upper
)
final_lower = (
basic_lower
if basic_lower > final_lower or prev_close < final_lower
else final_lower
)
if direction_up:
direction_up = candle.close >= final_lower
else:
direction_up = candle.close > final_upper
prev_close = candle.close
line[i] = final_lower if direction_up else final_upper
up[i] = direction_up
return line, up
def last(series: Sequence[Number]) -> Number:
for value in reversed(series):
if value is not None:
+62
View File
@@ -0,0 +1,62 @@
from __future__ import annotations
from dataclasses import dataclass, field
from app.config import Settings
# The exact phrase required in LIVE_CONFIRMATION before live trading starts.
LIVE_CONFIRMATION_PHRASE = "I UNDERSTAND THE RISK"
@dataclass(slots=True)
class LiveCheck:
"""Result of the go-live preflight."""
ok: bool
mode: str
# Each failure is a human-readable reason live trading is blocked.
blockers: list[str] = field(default_factory=list)
def as_dict(self) -> dict:
return {"ok": self.ok, "mode": self.mode, "blockers": self.blockers}
def check_live_ready(settings: Settings, starting_balance: float | None = None) -> LiveCheck:
"""Validate that the configuration is safe enough to trade real money.
Paper mode always passes. Live mode must satisfy every guard; the point is
that ``MODE=live`` alone is not sufficient to start live trading.
"""
if settings.mode != "live":
return LiveCheck(ok=True, mode=settings.mode)
blockers: list[str] = []
has_limit = (
settings.max_daily_loss > 0
or settings.max_drawdown_pct > 0
or settings.max_trades_per_day > 0
)
if not has_limit:
blockers.append(
"no active risk limit: set MAX_DAILY_LOSS, MAX_DRAWDOWN_PCT or MAX_TRADES_PER_DAY"
)
if settings.max_position_pct >= 1.0:
blockers.append(
"MAX_POSITION_PCT must be below 1.0 so a single position cannot be the whole account"
)
if settings.live_confirmation != LIVE_CONFIRMATION_PHRASE:
blockers.append(f'LIVE_CONFIRMATION must be exactly "{LIVE_CONFIRMATION_PHRASE}"')
balance = starting_balance if starting_balance is not None else settings.starting_balance
if balance < settings.min_live_balance:
blockers.append(
f"starting balance {balance:g} is below MIN_LIVE_BALANCE {settings.min_live_balance:g}"
)
if not settings.exchange_api_key or not settings.exchange_api_secret:
blockers.append("EXCHANGE_API_KEY and EXCHANGE_API_SECRET are required for live")
return LiveCheck(ok=not blockers, mode=settings.mode, blockers=blockers)
+2
View File
@@ -158,6 +158,8 @@ class MultiStrategyManager:
halted=engine_status.halted,
halt_reason=engine_status.halt_reason,
trades_today=engine_status.trades_today,
day_pnl=engine_status.day_pnl,
drawdown_pct=engine_status.drawdown_pct,
error=engine_status.error,
)
)
+24 -1
View File
@@ -5,7 +5,18 @@ from collections.abc import Sequence
from dataclasses import dataclass
from typing import Any, ClassVar, Literal, Protocol
from app.engine.indicators import atr, ema, macd, roc, rolling_std, rsi, sma
from app.engine.indicators import (
atr,
ema,
macd,
roc,
rolling_std,
rsi,
sma,
supertrend,
vwap,
williams_r,
)
from app.models import PositionSide
from app.schemas import Candle, ParamSpec, StrategyOut
@@ -116,6 +127,18 @@ class StrategyContext:
def roc(self, period: int = 10) -> float | None:
return roc(self.closes, period)[-1]
def vwap(self, period: int | None = None) -> float | None:
return vwap(self._candles, period)[-1]
def williams_r(self, period: int = 14) -> float | None:
return williams_r(self._candles, period)[-1]
def supertrend(
self, period: int = 10, multiplier: float = 3.0
) -> tuple[float | None, bool | None]:
line, up = supertrend(self._candles, period, multiplier)
return line[-1], up[-1]
# --- order intents ------------------------------------------------
def enter_long(
self,
@@ -0,0 +1,70 @@
from __future__ import annotations
from typing import ClassVar
from app.engine.indicators import atr, ema
from app.engine.strategies.base import Strategy, StrategyContext, register
from app.models import PositionSide
@register
class EmaCrossShort(Strategy):
"""Short-side example: sell EMA cross-downs, cover on cross-up."""
key: ClassVar[str] = "ema_cross_short"
name: ClassVar[str] = "EMA Crossover (short)"
description: ClassVar[str] = (
"Open a short when the fast EMA crosses below the slow EMA and cover when "
"it crosses back above. Demonstrates short trades; optional ATR stop."
)
default_params: ClassVar[dict] = {
"fast": 9,
"slow": 21,
"atr_period": 14,
"atr_stop_mult": 2.0,
"size": 1.0,
}
param_help: ClassVar[dict] = {
"fast": "Fast EMA period",
"slow": "Slow EMA period",
"atr_period": "ATR lookback for the stop",
"atr_stop_mult": "Stop distance in ATRs (0 disables)",
"size": "Fraction of equity per short",
}
param_bounds: ClassVar[dict] = {
"fast": (2, 100),
"slow": (3, 300),
"atr_stop_mult": (0.0, 10.0),
"size": (0.01, 1.0),
}
def on_candle(self, ctx: StrategyContext) -> None:
fast_period = int(self.params["fast"])
slow_period = int(self.params["slow"])
if len(ctx.closes) < slow_period + 2:
return
fast = ema(ctx.closes, fast_period)
slow = ema(ctx.closes, slow_period)
f_prev, f_now = fast[-2], fast[-1]
s_prev, s_now = slow[-2], slow[-1]
if None in (f_prev, f_now, s_prev, s_now):
return
crossed_down = f_prev >= s_prev and f_now < s_now
crossed_up = f_prev <= s_prev and f_now > s_now
if ctx.is_flat and crossed_down:
stop = None
mult = float(self.params["atr_stop_mult"])
if mult > 0:
atr_value = atr(ctx.candles, int(self.params["atr_period"]))[-1]
if atr_value:
stop = ctx.price + mult * atr_value
ctx.enter_short(
size=float(self.params["size"]),
stop_loss=stop,
reason="EMA cross down",
)
elif ctx.side == PositionSide.SHORT and crossed_up:
ctx.close(reason="EMA cross up")
@@ -0,0 +1,63 @@
from __future__ import annotations
from typing import ClassVar
from app.engine.indicators import supertrend as supertrend_series
from app.engine.strategies.base import Strategy, StrategyContext, register
from app.models import PositionSide
@register
class Supertrend(Strategy):
"""Trend following on the Supertrend indicator, long or short."""
key: ClassVar[str] = "supertrend"
name: ClassVar[str] = "Supertrend"
description: ClassVar[str] = (
"Go long when Supertrend flips to an uptrend and short when it flips to "
"a downtrend. Uses the Supertrend line as a stop."
)
default_params: ClassVar[dict] = {
"period": 10,
"multiplier": 3.0,
"allow_shorts": False,
"size": 1.0,
}
param_help: ClassVar[dict] = {
"period": "ATR period for the Supertrend bands",
"multiplier": "ATR multiplier (band width)",
"allow_shorts": "Also take short trades in downtrends",
"size": "Fraction of equity per trade",
}
param_bounds: ClassVar[dict] = {
"period": (2, 100),
"multiplier": (0.5, 10.0),
"size": (0.01, 1.0),
}
def on_candle(self, ctx: StrategyContext) -> None:
period = int(self.params["period"])
multiplier = float(self.params["multiplier"])
if len(ctx.candles) < period + 2:
return
line_series, up_series = supertrend_series(ctx.candles, period, multiplier)
line, up = line_series[-1], up_series[-1]
prev_up = up_series[-2]
if line is None or up is None or prev_up is None:
return
allow_shorts = bool(self.params.get("allow_shorts", False))
size = float(self.params["size"])
if ctx.side == PositionSide.LONG and not up:
ctx.close(reason="Supertrend turned down")
return
if ctx.side == PositionSide.SHORT and up:
ctx.close(reason="Supertrend turned up")
return
if ctx.is_flat and up and not prev_up:
ctx.enter_long(size=size, stop_loss=line, reason="Supertrend flipped up")
elif ctx.is_flat and allow_shorts and not up and prev_up:
ctx.enter_short(size=size, stop_loss=line, reason="Supertrend flipped down")
@@ -0,0 +1,63 @@
from __future__ import annotations
from typing import ClassVar
from app.engine.strategies.base import Strategy, StrategyContext, register
from app.models import PositionSide
@register
class VwapReversion(Strategy):
"""Mean reversion around VWAP, long-only."""
key: ClassVar[str] = "vwap_reversion"
name: ClassVar[str] = "VWAP Reversion"
description: ClassVar[str] = (
"Open long when price falls this far below a rolling VWAP and exit when "
"it returns to VWAP. Optional ATR stop."
)
default_params: ClassVar[dict] = {
"period": 20,
"deviation_pct": 0.005,
"atr_period": 14,
"atr_stop_mult": 2.0,
"size": 1.0,
}
param_help: ClassVar[dict] = {
"period": "Rolling VWAP window in bars",
"deviation_pct": "Entry distance below VWAP (0.005 = 0.5%)",
"atr_period": "ATR lookback for the stop",
"atr_stop_mult": "Stop distance in ATRs (0 disables)",
"size": "Fraction of equity per trade",
}
param_bounds: ClassVar[dict] = {
"period": (2, 200),
"deviation_pct": (0.0, 0.2),
"atr_stop_mult": (0.0, 10.0),
"size": (0.01, 1.0),
}
def on_candle(self, ctx: StrategyContext) -> None:
period = int(self.params["period"])
if len(ctx.candles) < period + 1:
return
reference = ctx.vwap(period)
if reference is None or reference <= 0:
return
threshold = reference * (1 - float(self.params["deviation_pct"]))
if ctx.is_flat and ctx.price < threshold:
stop = None
mult = float(self.params["atr_stop_mult"])
if mult > 0:
atr_value = ctx.atr(int(self.params["atr_period"]))
if atr_value:
stop = ctx.price - mult * atr_value
ctx.enter_long(
size=float(self.params["size"]),
stop_loss=stop,
reason="price below VWAP band",
)
elif ctx.side == PositionSide.LONG and ctx.price >= reference:
ctx.close(reason="price returned to VWAP")
@@ -0,0 +1,61 @@
from __future__ import annotations
from typing import ClassVar
from app.engine.strategies.base import Strategy, StrategyContext, register
from app.models import PositionSide
@register
class WilliamsR(Strategy):
"""Williams %R mean reversion, long-only."""
key: ClassVar[str] = "williams_r"
name: ClassVar[str] = "Williams %R"
description: ClassVar[str] = (
"Enter long when Williams %R is oversold (at or below the oversold "
"level) and exit when it becomes overbought. Optional ATR stop."
)
default_params: ClassVar[dict] = {
"period": 14,
"oversold": -80.0,
"overbought": -20.0,
"atr_period": 14,
"atr_stop_mult": 2.0,
"size": 1.0,
}
param_help: ClassVar[dict] = {
"period": "Williams %R lookback",
"oversold": "Oversold level (e.g. -80)",
"overbought": "Overbought level (e.g. -20)",
"atr_period": "ATR lookback for the stop",
"atr_stop_mult": "Stop distance in ATRs (0 disables)",
"size": "Fraction of equity per trade",
}
param_bounds: ClassVar[dict] = {
"period": (2, 100),
"oversold": (-100.0, -50.0),
"overbought": (-50.0, 0.0),
"atr_stop_mult": (0.0, 10.0),
"size": (0.01, 1.0),
}
def on_candle(self, ctx: StrategyContext) -> None:
value = ctx.williams_r(int(self.params["period"]))
if value is None:
return
if ctx.is_flat and value <= float(self.params["oversold"]):
stop = None
mult = float(self.params["atr_stop_mult"])
if mult > 0:
atr_value = ctx.atr(int(self.params["atr_period"]))
if atr_value:
stop = ctx.price - mult * atr_value
ctx.enter_long(
size=float(self.params["size"]),
stop_loss=stop,
reason=f"Williams %R {value:.1f} oversold",
)
elif ctx.side == PositionSide.LONG and value >= float(self.params["overbought"]):
ctx.close(reason=f"Williams %R {value:.1f} overbought")
+55
View File
@@ -0,0 +1,55 @@
from __future__ import annotations
import logging
from collections import deque
from datetime import UTC, datetime
class RingLogHandler(logging.Handler):
"""Keeps the most recent log records in memory for the dashboard.
Deliberately small and dependency-free: the goal is a debugging aid, not a
log store. Attach once at startup.
"""
def __init__(self, capacity: int = 200) -> None:
super().__init__()
self.records: deque[dict] = deque(maxlen=capacity)
def emit(self, record: logging.LogRecord) -> None:
try:
self.records.append(
{
"time": datetime.fromtimestamp(record.created, UTC).isoformat(),
"level": record.levelname.lower(),
"logger": record.name,
"message": record.getMessage(),
}
)
except Exception: # never let logging break the app
self.handleError(record)
def snapshot(self, limit: int = 100) -> list[dict]:
items = list(self.records)
return items[-limit:]
_handler: RingLogHandler | None = None
def install_log_capture(capacity: int = 200) -> RingLogHandler:
"""Attach the ring handler to the root logger (idempotent)."""
global _handler
if _handler is not None:
return _handler
_handler = RingLogHandler(capacity)
_handler.setLevel(logging.INFO)
root = logging.getLogger()
root.addHandler(_handler)
if root.level > logging.INFO or root.level == logging.NOTSET:
root.setLevel(logging.INFO)
return _handler
def get_log_handler() -> RingLogHandler | None:
return _handler
+2
View File
@@ -10,6 +10,7 @@ from fastapi.middleware.cors import CORSMiddleware
from app.api.routes import router
from app.config import Settings, get_settings
from app.db import init_db
from app.logs import install_log_capture
from app.runtime import Runtime
@@ -22,6 +23,7 @@ def create_app(
@asynccontextmanager
async def lifespan(app: FastAPI) -> AsyncIterator[None]:
install_log_capture()
init_db()
app.state.runtime = runtime
yield
+96
View File
@@ -0,0 +1,96 @@
from __future__ import annotations
from app.schemas import MultiStatusOut
# Rendered as Prometheus text exposition format (no client library needed).
# The route serves this at GET /api/metrics for the existing Prometheus scrape.
def _escape(value: str) -> str:
return value.replace("\\", "\\\\").replace('"', '\\"')
def _metric(
name: str, help_text: str, value: float | int, labels: dict[str, str] | None = None
) -> str:
lines = [f"# HELP {name} {help_text}", f"# TYPE {name} gauge"]
if labels:
rendered = ",".join(f'{k}="{_escape(v)}"' for k, v in labels.items())
lines.append(f"{name}{{{rendered}}} {value}")
else:
lines.append(f"{name} {value}")
return "\n".join(lines)
def render_metrics(status: MultiStatusOut, mode: str, exchange: str) -> str:
"""Render the current portfolio state as Prometheus metrics."""
parts = [
_metric("crypto_running", "1 when the bot is running", int(status.running)),
_metric("crypto_equity", "Total account equity", status.equity),
_metric("crypto_starting_balance", "Starting balance", status.starting_balance),
_metric("crypto_total_pnl", "Total profit and loss", status.total_pnl),
_metric(
"crypto_open_positions",
"Number of open positions across strategies",
sum(s.open_positions for s in status.strategies),
),
_metric(
"crypto_strategies",
"Number of configured strategies",
len(status.strategies),
),
]
if status.price is not None:
parts.append(_metric("crypto_price", "Latest mark price", status.price))
# Common labels shared by the per-strategy families.
lines = [
"# HELP crypto_strategy_equity Equity per strategy",
"# TYPE crypto_strategy_equity gauge",
]
for s in status.strategies:
labels = {"strategy": s.strategy_key, "symbol": s.symbol}
rendered = ",".join(f'{k}="{_escape(v)}"' for k, v in labels.items())
lines.append(f"crypto_strategy_equity{{{rendered}}} {s.equity}")
parts.append("\n".join(lines))
lines = [
"# HELP crypto_strategy_pnl Total P&L per strategy",
"# TYPE crypto_strategy_pnl gauge",
]
for s in status.strategies:
labels = {"strategy": s.strategy_key, "symbol": s.symbol}
rendered = ",".join(f'{k}="{_escape(v)}"' for k, v in labels.items())
lines.append(f"crypto_strategy_pnl{{{rendered}}} {s.total_pnl}")
parts.append("\n".join(lines))
lines = [
"# HELP crypto_strategy_allocation Fraction of the balance per strategy",
"# TYPE crypto_strategy_allocation gauge",
]
for s in status.strategies:
labels = {"strategy": s.strategy_key}
rendered = ",".join(f'{k}="{_escape(v)}"' for k, v in labels.items())
lines.append(f"crypto_strategy_allocation{{{rendered}}} {s.allocation}")
parts.append("\n".join(lines))
lines = [
"# HELP crypto_strategy_halted 1 when a strategy is halted",
"# TYPE crypto_strategy_halted gauge",
]
for s in status.strategies:
labels = {"strategy": s.strategy_key}
rendered = ",".join(f'{k}="{_escape(v)}"' for k, v in labels.items())
lines.append(f"crypto_strategy_halted{{{rendered}}} {int(s.halted)}")
parts.append("\n".join(lines))
info_labels = {"mode": mode, "exchange": exchange}
rendered = ",".join(f'{k}="{_escape(v)}"' for k, v in info_labels.items())
parts.append(
"# HELP crypto_info Build information\n"
"# TYPE crypto_info gauge\n"
f"crypto_info{{{rendered}}} 1"
)
return "\n".join(parts) + "\n"
+91 -6
View File
@@ -11,6 +11,7 @@ from app.broker import build_broker
from app.broker.base import Broker
from app.config import Settings
from app.engine.engine import TradingEngine
from app.engine.live_guard import check_live_ready
from app.engine.manager import MultiStrategyManager
from app.engine.strategies import get_strategy
from app.market import build_market_data
@@ -31,6 +32,15 @@ from app.store import Store
logger = logging.getLogger(__name__)
_LOG_LEVELS = {
"debug": logging.DEBUG,
"info": logging.INFO,
"trade": logging.INFO,
"warning": logging.WARNING,
"error": logging.ERROR,
"critical": logging.CRITICAL,
}
FeedFactory = Callable[[Settings], MarketData]
BrokerFactory = Callable[[Settings], Broker]
NotifierFactory = Callable[[Settings], Notifier | None]
@@ -55,7 +65,7 @@ class Runtime:
self._feed_factory = feed_factory
self._broker_factory = broker_factory
self.notifier = notifier if notifier is not None else notifier_factory(settings)
self.notify_levels = notify_levels or {"trade", "error"}
self.notify_levels = notify_levels or settings.notify_level_set or {"trade", "error"}
self.manager = MultiStrategyManager(
store=self.store,
settings=settings,
@@ -65,6 +75,7 @@ class Runtime:
self.manager.set_publisher(self._broadcast)
self._subscribers: set[asyncio.Queue] = set()
self._notify_tasks: set[asyncio.Task] = set()
self._summary_task: asyncio.Task | None = None
# The first (usually only) engine, kept for the single-strategy API and
# backwards compatibility with existing callers and tests.
@@ -89,19 +100,66 @@ class Runtime:
with suppress(asyncio.QueueFull):
queue.put_nowait(payload)
if payload.get("type") == "event":
self._log_event(payload["data"])
self._maybe_notify(payload["data"])
def _maybe_notify(self, event: dict[str, Any]) -> None:
if self.notifier is None or event.get("level") not in self.notify_levels:
return
def _log_event(self, event: dict[str, Any]) -> None:
"""Mirror bot events into the logger so the dashboard log view is useful."""
level = str(event.get("level", "info")).lower()
message = event.get("message", "")
logger.log(_LOG_LEVELS.get(level, logging.INFO), "%s", message)
def _maybe_notify(self, event: dict[str, Any]) -> None:
if event.get("level") not in self.notify_levels:
return
self.notify_now(event.get("level", "info"), event.get("message", ""))
def notify_now(self, level: str, message: str) -> None:
"""Send a notification, ignoring level filtering (best-effort)."""
if self.notifier is None:
return
try:
task = asyncio.create_task(self.notifier.send(event["level"], message))
task = asyncio.create_task(self.notifier.send(level, message))
except RuntimeError: # no running loop (e.g. sync test context)
return
self._notify_tasks.add(task)
task.add_done_callback(self._notify_tasks.discard)
def _start_summary_loop(self) -> None:
minutes = self.settings.summary_interval_minutes
if minutes <= 0 or self.notifier is None:
return
self._stop_summary_loop()
self._summary_task = asyncio.create_task(self._summary_loop(minutes * 60))
def _stop_summary_loop(self) -> None:
if self._summary_task is not None:
self._summary_task.cancel()
self._summary_task = None
async def _summary_loop(self, interval_seconds: float) -> None:
try:
while True:
await asyncio.sleep(interval_seconds)
self.notify_now("summary", self.summary_message())
except asyncio.CancelledError:
raise
def summary_message(self) -> str:
status = self.manager.status()
lines = [
f"Portfolio: equity {status.equity:,.2f} "
f"({status.total_pnl:+,.2f}) across {len(status.strategies)} strategies"
]
for s in status.strategies:
state = "HALTED" if s.halted else ("running" if status.running else "stopped")
lines.append(
f"- {s.strategy_name or s.strategy_key} "
f"({s.allocation * 100:.0f}%): {s.equity:,.2f} ({s.total_pnl:+,.2f}) "
f"[{state}]"
)
return "\n".join(lines)
# --- lifecycle ----------------------------------------------------
async def start(
self,
@@ -129,15 +187,41 @@ class Runtime:
return engine.status() if engine is not None else self._idle_status()
async def start_many(self, request: StartManyRequest) -> MultiStatusOut:
return await self.manager.start(request)
check = check_live_ready(
self.settings,
request.starting_balance or self.settings.starting_balance,
)
if not check.ok:
raise ValueError("live trading blocked: " + "; ".join(check.blockers))
status = await self.manager.start(request)
if self.settings.notify_lifecycle:
names = ", ".join(s.strategy_name or s.strategy_key for s in status.strategies)
self.notify_now(
"info",
f"Started {len(status.strategies)} strategy(ies) in {self.settings.mode} "
f"mode: {names}",
)
self._start_summary_loop()
return status
def live_check(self) -> dict:
return check_live_ready(self.settings).as_dict()
async def stop(self) -> StatusOut:
had_runs = bool(self.manager.runs)
await self.manager.stop()
self._stop_summary_loop()
if had_runs and self.settings.notify_lifecycle:
self.notify_now("info", "Stopped all strategies")
engine = self.engine
return engine.status() if engine is not None else self._idle_status()
async def kill(self, reason: str = "manual kill switch") -> StatusOut:
had_runs = bool(self.manager.runs)
await self.manager.kill(reason)
self._stop_summary_loop()
if had_runs:
self.notify_now("error", f"KILL SWITCH: {reason}")
engine = self.engine
return engine.status() if engine is not None else self._idle_status()
@@ -199,6 +283,7 @@ class Runtime:
)
async def shutdown(self) -> None:
self._stop_summary_loop()
await self.manager.shutdown()
if self.notifier is not None:
await self.notifier.close()
+2
View File
@@ -177,6 +177,8 @@ class StrategyStatusOut(BaseModel):
halted: bool = False
halt_reason: str | None = None
trades_today: int = 0
day_pnl: float = 0.0
drawdown_pct: float = 0.0
error: str | None = None
+2
View File
@@ -134,6 +134,8 @@ def test_start_many_and_multi_status(runtime: Runtime, market: FakeMarketData) -
assert status["running"] is True
assert len(status["strategies"]) == 2
assert status["equity"] == 10000
# Per-strategy fields the dashboard aggregates must be present.
assert {"day_pnl", "drawdown_pct"} <= set(status["strategies"][0])
client.post("/api/bot/stop")
+91
View File
@@ -0,0 +1,91 @@
from __future__ import annotations
import pytest
from app.config import Settings
from app.engine.live_guard import LIVE_CONFIRMATION_PHRASE, check_live_ready
def live_settings(**overrides) -> Settings:
base = {
"mode": "live",
"max_daily_loss": 100.0,
"max_position_pct": 0.5,
"live_confirmation": LIVE_CONFIRMATION_PHRASE,
"exchange_api_key": "k",
"exchange_api_secret": "s",
"starting_balance": 1000.0,
"min_live_balance": 100.0,
}
base.update(overrides)
return Settings(**base)
def test_paper_mode_always_ok() -> None:
check = check_live_ready(Settings(mode="paper", max_position_pct=1.0))
assert check.ok is True
assert check.blockers == []
def test_live_ok_when_fully_configured() -> None:
check = check_live_ready(live_settings())
assert check.ok is True
def test_live_blocked_without_any_risk_limit() -> None:
check = check_live_ready(
live_settings(max_daily_loss=0, max_drawdown_pct=0, max_trades_per_day=0)
)
assert check.ok is False
assert any("risk limit" in b for b in check.blockers)
def test_live_blocked_when_position_cap_is_full_account() -> None:
check = check_live_ready(live_settings(max_position_pct=1.0))
assert check.ok is False
assert any("MAX_POSITION_PCT" in b for b in check.blockers)
def test_live_blocked_without_confirmation_phrase() -> None:
check = check_live_ready(live_settings(live_confirmation=""))
assert check.ok is False
assert any("LIVE_CONFIRMATION" in b for b in check.blockers)
def test_live_blocked_below_min_balance() -> None:
check = check_live_ready(live_settings(starting_balance=50.0))
assert check.ok is False
assert any("MIN_LIVE_BALANCE" in b for b in check.blockers)
def test_live_blocked_without_credentials() -> None:
check = check_live_ready(live_settings(exchange_api_key="", exchange_api_secret=""))
assert check.ok is False
assert any("EXCHANGE_API_KEY" in b for b in check.blockers)
async def test_start_many_refuses_live_without_confirmation(settings) -> None:
from app.runtime import Runtime
from app.schemas import StartManyRequest, StrategySpec
settings.mode = "live"
settings.exchange_api_key = "k"
settings.exchange_api_secret = "s"
settings.max_position_pct = 1.0 # unsafe
runtime = Runtime(settings)
with pytest.raises(ValueError, match="live trading blocked"):
await runtime.start_many(
StartManyRequest(strategies=[StrategySpec(strategy_key="sma_cross")])
)
def test_live_check_endpoint(runtime) -> None:
from fastapi.testclient import TestClient
from app.main import create_app
app = create_app(runtime.settings, runtime)
with TestClient(app) as client:
body = client.get("/api/live-check").json()
assert body["ok"] is True # paper mode
assert body["mode"] == "paper"
+120
View File
@@ -0,0 +1,120 @@
from __future__ import annotations
import pytest
from app.engine.indicators import supertrend, vwap
from app.engine.strategies import get_strategy
from app.engine.strategies.base import StrategyContext
from app.models import PositionSide
from app.schemas import Candle
def candles(closes: list[float], volume: float = 1.0) -> list[Candle]:
return [
Candle(ts=i, open=c, high=c * 1.001, low=c * 0.999, close=c, volume=volume)
for i, c in enumerate(closes)
]
def ctx(closes: list[float], volume: float = 1.0, position=None) -> StrategyContext:
cs = candles(closes, volume)
return StrategyContext(candles=cs, position=position, equity=1000.0, cash=1000.0)
# --- indicators -----------------------------------------------------------
def test_vwap_equals_typical_price_when_flat() -> None:
cs = candles([100.0, 100.0, 100.0])
series = vwap(cs)
# Typical price equals the close for symmetric high/low here only if equal;
# with high/low spread the VWAP is the volume-weighted typical price.
assert series[-1] is not None
assert series[-1] == pytest.approx(100.0, abs=0.5)
def test_vwap_weights_by_volume() -> None:
cs = [
Candle(ts=0, open=100, high=100, low=100, close=100, volume=1),
Candle(ts=1, open=200, high=200, low=200, close=200, volume=3),
]
series = vwap(cs)
assert series[-1] == pytest.approx((100 * 1 + 200 * 3) / 4)
def test_vwap_rolling_window() -> None:
cs = [
Candle(ts=0, open=100, high=100, low=100, close=100, volume=1),
Candle(ts=1, open=100, high=100, low=100, close=100, volume=1),
Candle(ts=2, open=200, high=200, low=200, close=200, volume=1),
]
series = vwap(cs, period=2)
assert series[0] is None
assert series[1] == pytest.approx(100.0)
assert series[2] == pytest.approx(150.0)
def test_supertrend_direction_flips() -> None:
rising = [float(i) for i in range(1, 60)]
_, up_rising = supertrend(candles(rising), 10, 3.0)
assert up_rising[-1] is True
falling = [float(i) for i in range(60, 1, -1)]
_, up_falling = supertrend(candles(falling), 10, 3.0)
assert up_falling[-1] is False
def test_supertrend_line_trails_price() -> None:
rising = [float(i) for i in range(1, 60)]
line, up = supertrend(candles(rising), 10, 3.0)
assert line[-1] is not None and up[-1] is True
assert line[-1] < rising[-1] # the stop sits below price in an uptrend
# --- strategies -----------------------------------------------------------
def test_new_strategies_registered() -> None:
from app.engine.strategies import list_strategies
keys = {c.key for c in list_strategies()}
assert {"supertrend", "vwap_reversion", "ema_cross_short"} <= keys
def test_ema_cross_short_opens_a_short() -> None:
strategy = get_strategy("ema_cross_short")({"fast": 2, "slow": 4, "atr_stop_mult": 0})
# Fast EMA above the slow then crossing below: mirror of the long case.
c = ctx([10, 10, 10, 10, 10, 10, 10, 10, 13, 11, 8])
strategy.on_candle(c)
intents = c.take_intents()
assert intents and intents[0].action == "enter_short"
assert intents[0].stop_loss is None
def test_ema_cross_short_covers_on_cross_up() -> None:
from app.models import Position
strategy = get_strategy("ema_cross_short")({"fast": 2, "slow": 4, "atr_stop_mult": 0})
position = Position(
strategy_key="ema_cross_short",
symbol="BTC/USDT",
side=PositionSide.SHORT,
qty=1.0,
entry_price=100.0,
)
c = ctx([10, 10, 10, 10, 10, 10, 10, 10, 7, 9, 12], position=position)
strategy.on_candle(c)
intents = c.take_intents()
assert intents and intents[0].action == "close"
def test_vwap_reversion_runs_without_error() -> None:
strategy = get_strategy("vwap_reversion")({"period": 5, "deviation_pct": 0.01})
c = ctx([100, 100, 100, 100, 100, 90])
strategy.on_candle(c)
intents = c.take_intents()
assert intents and intents[0].action == "enter_long"
def test_supertrend_runs_without_error() -> None:
strategy = get_strategy("supertrend")({})
c = ctx([100 + i for i in range(40)])
strategy.on_candle(c)
# No assertion on intents (depends on the flip); just must not raise.
assert isinstance(c.take_intents(), list)
+98
View File
@@ -66,3 +66,101 @@ async def test_runtime_ignores_info_events() -> None:
runtime._broadcast({"type": "event", "data": {"level": "info", "message": "started"}})
await asyncio.gather(*list(runtime._notify_tasks))
assert recorder.messages == []
async def test_notify_levels_are_configurable() -> None:
recorder = RecordingNotifier()
settings = Settings(telegram_bot_token="", notify_webhook_url="", notify_levels="info,trade")
runtime = Runtime(settings, notifier=recorder)
runtime._broadcast({"type": "event", "data": {"level": "info", "message": "started"}})
await asyncio.gather(*list(runtime._notify_tasks))
assert recorder.messages == [("info", "started")]
async def test_start_and_stop_notify_lifecycle(settings, store, market) -> None:
from app.broker.paper import PaperBroker
from app.schemas import StartManyRequest, StrategySpec
settings.notify_lifecycle = True
recorder = RecordingNotifier()
runtime = Runtime(
settings,
store,
feed_factory=lambda _s: market,
broker_factory=lambda _s: PaperBroker(fee_bps=0, slippage_bps=0),
notifier=recorder,
)
await runtime.start_many(StartManyRequest(strategies=[StrategySpec(strategy_key="sma_cross")]))
await runtime.stop()
await asyncio.gather(*list(runtime._notify_tasks))
levels = [level for level, _ in recorder.messages]
assert "info" in levels
assert any("Started" in msg for _, msg in recorder.messages)
assert any("Stopped" in msg for _, msg in recorder.messages)
await runtime.shutdown()
async def test_kill_notifies(settings, store, market) -> None:
from app.broker.paper import PaperBroker
from app.schemas import StartManyRequest, StrategySpec
recorder = RecordingNotifier()
runtime = Runtime(
settings,
store,
feed_factory=lambda _s: market,
broker_factory=lambda _s: PaperBroker(fee_bps=0, slippage_bps=0),
notifier=recorder,
)
await runtime.start_many(StartManyRequest(strategies=[StrategySpec(strategy_key="sma_cross")]))
await runtime.kill("panic")
await asyncio.gather(*list(runtime._notify_tasks))
assert any(level == "error" and "KILL SWITCH" in msg for level, msg in recorder.messages)
await runtime.shutdown()
async def test_summary_message_lists_strategies(settings, store, market) -> None:
from app.broker.paper import PaperBroker
from app.schemas import StartManyRequest, StrategySpec
runtime = Runtime(
settings,
store,
feed_factory=lambda _s: market,
broker_factory=lambda _s: PaperBroker(fee_bps=0, slippage_bps=0),
notifier=RecordingNotifier(),
)
await runtime.start_many(
StartManyRequest(
strategies=[
StrategySpec(strategy_key="sma_cross", weight=1),
StrategySpec(strategy_key="ema_cross", weight=3),
],
starting_balance=10000,
)
)
message = runtime.summary_message()
assert "Portfolio" in message
assert "SMA Crossover" in message
assert "EMA Crossover" in message
assert "75%" in message # the weighted strategy's allocation
await runtime.shutdown()
async def test_summary_loop_runs(settings, store, market) -> None:
from app.broker.paper import PaperBroker
settings.summary_interval_minutes = 1 # -> 60s; we only check it starts
recorder = RecordingNotifier()
runtime = Runtime(
settings,
store,
feed_factory=lambda _s: market,
broker_factory=lambda _s: PaperBroker(fee_bps=0, slippage_bps=0),
notifier=recorder,
)
runtime._start_summary_loop()
assert runtime._summary_task is not None
runtime._stop_summary_loop()
assert runtime._summary_task is None
+107
View File
@@ -0,0 +1,107 @@
from __future__ import annotations
import logging
from app.logs import RingLogHandler
from app.metrics import render_metrics
from app.schemas import MultiStatusOut, StrategyStatusOut
def make_status(**overrides) -> MultiStatusOut:
strategy = StrategyStatusOut(
strategy_key="sma_cross",
strategy_name="SMA Crossover",
params={},
symbol="BTC/USDT",
timeframe="5m",
allocation=0.5,
cash=5000,
equity=5100,
realized_pnl=100,
unrealized_pnl=0,
total_pnl=100,
open_positions=1,
halted=False,
trades_today=2,
)
base = {
"running": True,
"mode": "paper",
"exchange": "binance",
"price": 100.0,
"starting_balance": 10000,
"equity": 10100,
"total_pnl": 100,
"strategies": [strategy],
}
base.update(overrides)
return MultiStatusOut(**base)
def test_render_metrics_contains_core_series() -> None:
body = render_metrics(make_status(), "paper", "binance")
assert "crypto_running 1" in body
assert "crypto_equity 10100" in body
assert "crypto_total_pnl 100" in body
assert "crypto_open_positions 1" in body
assert 'crypto_strategy_equity{strategy="sma_cross",symbol="BTC/USDT"} 5100' in body
assert 'crypto_strategy_allocation{strategy="sma_cross"} 0.5' in body
assert 'crypto_info{mode="paper",exchange="binance"} 1' in body
def test_render_metrics_omits_price_when_none() -> None:
body = render_metrics(make_status(price=None), "paper", "binance")
assert "crypto_price" not in body
def test_ring_log_handler_captures() -> None:
handler = RingLogHandler(capacity=5)
logger = logging.getLogger("test.ring")
logger.addHandler(handler)
logger.setLevel(logging.INFO)
try:
logger.info("hello %s", "world")
entries = handler.snapshot()
assert entries[-1]["message"] == "hello world"
assert entries[-1]["level"] == "info"
finally:
logger.removeHandler(handler)
def test_ring_log_handler_respects_capacity() -> None:
handler = RingLogHandler(capacity=3)
logger = logging.getLogger("test.ring.cap")
logger.addHandler(handler)
logger.setLevel(logging.INFO)
try:
for i in range(10):
logger.info("m%d", i)
entries = handler.snapshot()
assert len(entries) == 3
assert entries[-1]["message"] == "m9"
finally:
logger.removeHandler(handler)
def test_metrics_endpoint(runtime) -> None:
from fastapi.testclient import TestClient
from app.main import create_app
app = create_app(runtime.settings, runtime)
with TestClient(app) as client:
response = client.get("/api/metrics")
assert response.status_code == 200
assert "crypto_running" in response.text
def test_logs_endpoint(runtime) -> None:
from fastapi.testclient import TestClient
from app.main import create_app
app = create_app(runtime.settings, runtime)
with TestClient(app) as client:
response = client.get("/api/logs")
assert response.status_code == 200
assert "entries" in response.json()
+87
View File
@@ -0,0 +1,87 @@
from __future__ import annotations
import pytest
from app.engine.indicators import williams_r
from app.engine.strategies import get_strategy
from app.engine.strategies.base import StrategyContext
from app.models import Position, PositionSide
from app.schemas import Candle
def candles(closes: list[float]) -> list[Candle]:
return [
Candle(ts=i, open=c, high=c * 1.001, low=c * 0.999, close=c, volume=1.0)
for i, c in enumerate(closes)
]
def ctx(closes: list[float], position=None) -> StrategyContext:
return StrategyContext(candles=candles(closes), position=position, equity=1000.0, cash=1000.0)
# --- indicator ------------------------------------------------------------
def test_williams_r_bounds() -> None:
series = williams_r(candles([100, 102, 98, 101, 99, 103, 97, 100]), 5)
for value in series:
if value is not None:
assert -100.0 <= value <= 0.0
def test_williams_r_rising_is_overbought() -> None:
rising = [float(i) for i in range(1, 30)]
value = williams_r(candles(rising), 14)[-1]
assert value is not None and value > -50 # near the top of the range
def test_williams_r_falling_is_oversold() -> None:
falling = [float(i) for i in range(30, 1, -1)]
value = williams_r(candles(falling), 14)[-1]
assert value is not None and value < -50 # near the bottom of the range
def test_williams_r_flat_series_is_neutral() -> None:
flat = [100.0] * 20
assert williams_r(candles(flat), 14)[-1] == pytest.approx(-50.0)
# --- strategy -------------------------------------------------------------
def test_williams_r_registered() -> None:
from app.engine.strategies import list_strategies
assert "williams_r" in {c.key for c in list_strategies()}
def test_enters_long_when_oversold() -> None:
strategy = get_strategy("williams_r")({"period": 5, "oversold": -80, "atr_stop_mult": 0})
falling = [100 - i for i in range(15)]
c = ctx([float(x) for x in falling])
strategy.on_candle(c)
intents = c.take_intents()
assert intents and intents[0].action == "enter_long"
def test_exits_when_overbought() -> None:
strategy = get_strategy("williams_r")({"period": 5, "overbought": -20, "atr_stop_mult": 0})
position = Position(
strategy_key="williams_r",
symbol="BTC/USDT",
side=PositionSide.LONG,
qty=1.0,
entry_price=100.0,
)
rising = [100 + i for i in range(15)]
c = ctx([float(x) for x in rising], position=position)
strategy.on_candle(c)
intents = c.take_intents()
assert intents and intents[0].action == "close"
def test_atr_stop_is_set_when_enabled() -> None:
strategy = get_strategy("williams_r")({"period": 5, "oversold": -80, "atr_stop_mult": 2.0})
falling = [float(100 - i) for i in range(15)]
c = ctx(falling)
strategy.on_candle(c)
intents = c.take_intents()
assert intents and intents[0].action == "enter_long"
assert intents[0].stop_loss is not None
+5
View File
@@ -32,6 +32,11 @@ services:
- TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-}
- TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-}
- NOTIFY_WEBHOOK_URL=${NOTIFY_WEBHOOK_URL:-}
- NOTIFY_LEVELS=${NOTIFY_LEVELS:-trade,error}
- NOTIFY_LIFECYCLE=${NOTIFY_LIFECYCLE:-true}
- SUMMARY_INTERVAL_MINUTES=${SUMMARY_INTERVAL_MINUTES:-0}
- LIVE_CONFIRMATION=${LIVE_CONFIRMATION:-}
- MIN_LIVE_BALANCE=${MIN_LIVE_BALANCE:-100}
- API_TOKEN=${API_TOKEN:-}
- API_TOKEN_HEADER=${API_TOKEN_HEADER:-X-API-Token}
volumes:
+5
View File
@@ -42,6 +42,11 @@ services:
- TELEGRAM_BOT_TOKEN=${CRYPTO_TELEGRAM_BOT_TOKEN:-}
- TELEGRAM_CHAT_ID=${CRYPTO_TELEGRAM_CHAT_ID:-}
- NOTIFY_WEBHOOK_URL=${CRYPTO_NOTIFY_WEBHOOK_URL:-}
- NOTIFY_LEVELS=${CRYPTO_NOTIFY_LEVELS:-trade,error}
- NOTIFY_LIFECYCLE=${CRYPTO_NOTIFY_LIFECYCLE:-true}
- SUMMARY_INTERVAL_MINUTES=${CRYPTO_SUMMARY_INTERVAL_MINUTES:-0}
- LIVE_CONFIRMATION=${CRYPTO_LIVE_CONFIRMATION:-}
- MIN_LIVE_BALANCE=${CRYPTO_MIN_LIVE_BALANCE:-100}
- API_TOKEN=${CRYPTO_API_TOKEN:-}
- API_TOKEN_HEADER=${CRYPTO_API_TOKEN_HEADER:-X-API-Token}
volumes:
+59
View File
@@ -0,0 +1,59 @@
# Operations runbook
Practical steps for running the deployed bot. Host paths are examples — adjust
to the deploy host.
## Find the stack
```bash
docker compose ps
docker compose logs --tail=200 backend
docker compose logs -f frontend
```
The backend exposes `GET /api/metrics` (Prometheus text format) for the existing
Prometheus/Grafana stack; scrape it alongside the other services. Useful series:
`crypto_running`, `crypto_equity`, `crypto_total_pnl`, `crypto_open_positions`,
`crypto_strategy_equity`, `crypto_strategy_pnl`, `crypto_strategy_halted`,
`crypto_info`.
## Stop / kill trading
- **Dashboard:** the **Kill all** button (or Stop all) flattens and halts.
- **API:** `curl -X POST -H "X-API-Token: $TOKEN" https://<host>/api/bot/kill`
- **Hard stop:** `docker compose stop backend` stops the process entirely. It
does **not** close open positions — use the API kill first if you care.
## Something is wrong
1. `docker compose ps` — is the service `healthy`?
2. `docker compose logs --tail=200 backend` — look for `error`/`Traceback`.
3. In the dashboard, open **Server logs** (shows the in-memory ring of recent
log lines) and **Activity** (trades, halts, errors).
4. `curl https://<host>/api/live-check` — if live is blocked, the reasons are
listed.
## A deploy went out but the UI looks stale
The deploy job fails if the frontend container's build stamp does not match the
commit; if you see stale UI and the job passed, hard-refresh or open
incognito. The footer shows `client` vs `server` versions — they must match.
## Reset paper state
```bash
docker compose stop backend
# remove the SQLite file on the host mount
rm -f <CRYPTO_DATA_DIR>/trader.db
docker compose start backend
```
## Going live (do this deliberately)
1. Rehearse the kill switch in paper mode.
2. Set `MAX_DAILY_LOSS`, `MAX_DRAWDOWN_PCT` and/or `MAX_TRADES_PER_DAY`, and
`MAX_POSITION_PCT < 1.0`.
3. Set `MIN_LIVE_BALANCE` and add exchange credentials.
4. Set `LIVE_CONFIRMATION="I UNDERSTAND THE RISK"`.
5. Deploy, confirm `/api/live-check` returns `ok: true`, then start with a
small balance and watch it.
+59 -56
View File
@@ -1,14 +1,15 @@
<script setup>
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { aggregateStatus } from './aggregate'
import * as api from './api'
import BacktestPanel from './components/BacktestPanel.vue'
import EquityChart from './components/EquityChart.vue'
import EventLog from './components/EventLog.vue'
import LogsPanel from './components/LogsPanel.vue'
import MultiStrategyPanel from './components/MultiStrategyPanel.vue'
import OrdersTable from './components/OrdersTable.vue'
import PositionsTable from './components/PositionsTable.vue'
import StatusCards from './components/StatusCards.vue'
import StrategyPanel from './components/StrategyPanel.vue'
import SweepPanel from './components/SweepPanel.vue'
const status = ref({
@@ -33,6 +34,30 @@ const strategies = ref([])
const strategiesLoading = ref(true)
const presets = ref([])
const multiStatus = ref({ running: false, strategies: [], total_pnl: 0, equity: 0 })
const liveCheck = ref({ ok: true, mode: 'paper', blockers: [] })
const runningLabel = computed(() => {
const list = multiStatus.value.strategies || []
if (!list.length) return 'Idle'
if (list.length === 1) {
return `Running: ${list[0].strategy_name || list[0].strategy_key}`
}
return `Running: ${list.length} strategies`
})
const displayStatus = computed(() => aggregateStatus(status.value, multiStatus.value))
const scopeLabel = computed(() => {
const list = multiStatus.value.strategies || []
if (!list.length) {
return status.value.symbol ? `${status.value.symbol} ${status.value.timeframe}` : ''
}
const first = list[0]
const sameScope = list.every(
(s) => s.symbol === first.symbol && s.timeframe === first.timeframe,
)
return sameScope ? `${first.symbol} ${first.timeframe}` : `${list.length} pairs`
})
const positions = ref([])
const orders = ref([])
const events = ref([])
@@ -96,23 +121,22 @@ async function handleDeletePreset(id) {
await loadPresets()
}
async function handleStart(payload) {
busy.value = true
try {
status.value = await api.startBot(payload)
await refreshAll()
} catch (error) {
status.value = { ...status.value, error: error.response?.data?.detail || error.message }
} finally {
busy.value = false
}
}
async function refreshMulti() {
multiStatus.value = await api.getMultiStatus()
}
async function refreshLiveCheck() {
liveCheck.value = await api.getLiveCheck()
}
async function handleStartMany(payload) {
if (liveCheck.value.mode === 'live' && !liveCheck.value.ok) {
status.value = {
...status.value,
error: 'Live trading blocked: ' + liveCheck.value.blockers.join('; '),
}
return
}
busy.value = true
try {
multiStatus.value = await api.startMany(payload)
@@ -148,29 +172,6 @@ async function handleKillMany() {
}
}
async function handleStop() {
busy.value = true
try {
status.value = await api.stopBot()
await refreshMulti()
await refreshAll()
} finally {
busy.value = false
}
}
async function handleKill() {
busy.value = true
try {
status.value = await api.killBot('manual kill switch')
await refreshAll()
} catch (error) {
status.value = { ...status.value, error: error.response?.data?.detail || error.message }
} finally {
busy.value = false
}
}
async function handleClose(id) {
try {
status.value = await api.closePosition(id)
@@ -249,7 +250,8 @@ onMounted(() => {
statusTimer = setInterval(
() => {
api.getStatus().then((s) => (status.value = s)).catch(() => {})
refreshMulti().catch(() => {})
refreshMulti().catch(() => {})
refreshLiveCheck().catch(() => {})
},
3000,
)
@@ -293,47 +295,46 @@ onUnmounted(() => {
</span>
</div>
<div class="text-xs text-slate-400">
<span v-if="status.strategy_name">Running: {{ status.strategy_name }}</span>
<span v-else>Idle</span>
<span v-if="status.symbol"> · {{ status.symbol }} {{ status.timeframe }}</span>
<span>{{ runningLabel }}</span>
<span v-if="scopeLabel"> · {{ scopeLabel }}</span>
</div>
</header>
<div
v-if="status.halted"
v-if="displayStatus.halted"
class="rounded-lg border border-rose-500 bg-rose-500/20 p-3 text-sm font-semibold text-rose-100"
>
HALTED — {{ status.halt_reason }}. Trading is stopped and any open position was
HALTED — {{ displayStatus.halt_reason }}. Trading is stopped and any open position was
flattened. Restart the bot to resume (limits reset).
</div>
<div
v-if="liveCheck.mode === 'live' && !liveCheck.ok"
class="rounded-lg border border-amber-500 bg-amber-500/15 p-3 text-sm text-amber-100"
>
<p class="font-semibold">Live trading is blocked by the go-live checks:</p>
<ul class="mt-1 list-disc pl-5">
<li v-for="(b, i) in liveCheck.blockers" :key="i">{{ b }}</li>
</ul>
</div>
<div v-if="status.error" class="rounded-lg border border-rose-500/40 bg-rose-500/10 p-3 text-sm text-rose-200">
{{ status.error }}
</div>
<StatusCards :status="status" />
<StrategyPanel
:strategies="strategies"
:status="status"
:busy="busy"
:presets="presets"
:loading="strategiesLoading"
@start="handleStart"
@stop="handleStop"
@kill="handleKill"
@save-preset="handleSavePreset"
@delete-preset="handleDeletePreset"
/>
<StatusCards :status="displayStatus" />
<MultiStrategyPanel
:strategies="strategies"
:multi-status="multiStatus"
:presets="presets"
:busy="busy"
:loading="strategiesLoading"
@start-many="handleStartMany"
@stop="handleStopMany"
@kill="handleKillMany"
@save-preset="handleSavePreset"
@delete-preset="handleDeletePreset"
/>
<BacktestPanel :strategies="strategies" :status="status" :loading="strategiesLoading" />
@@ -344,6 +345,8 @@ onUnmounted(() => {
<EventLog :events="events" />
</div>
<LogsPanel />
<PositionsTable :positions="positions" @close="handleClose" />
<OrdersTable :orders="orders" />
+34
View File
@@ -0,0 +1,34 @@
/**
* Top-of-dashboard status. With one strategy it is that strategy's status;
* with several, the per-strategy numbers are aggregated for the whole account.
*/
export function aggregateStatus(status, multiStatus) {
const list = multiStatus?.strategies || []
if (list.length <= 1) return status
const sum = (field) => list.reduce((acc, s) => acc + (s[field] || 0), 0)
const halted = list.filter((s) => s.halted)
return {
...status,
running: multiStatus.running,
price: multiStatus.price ?? status.price,
cash: sum('cash'),
equity: multiStatus.equity,
starting_balance: multiStatus.starting_balance,
realized_pnl: sum('realized_pnl'),
unrealized_pnl: sum('unrealized_pnl'),
total_pnl: multiStatus.total_pnl,
day_pnl: sum('day_pnl'),
// Worst individual strategy drawdown; the portfolio peak is not tracked.
drawdown_pct: Math.max(0, ...list.map((s) => s.drawdown_pct || 0)),
trades_today: sum('trades_today'),
open_positions: sum('open_positions'),
halted: halted.length > 0,
halt_reason:
halted
.map((s) => s.halt_reason)
.filter(Boolean)
.join('; ') || null,
}
}
+87
View File
@@ -0,0 +1,87 @@
import { describe, expect, it } from 'vitest'
import { aggregateStatus } from './aggregate'
const SINGLE = { equity: 100, total_pnl: 5, strategies: [] }
function strategy(overrides = {}) {
return {
strategy_key: 'sma_cross',
symbol: 'BTC/USDT',
timeframe: '5m',
allocation: 0.5,
cash: 1000,
equity: 1000,
realized_pnl: 0,
unrealized_pnl: 0,
total_pnl: 0,
open_positions: 0,
halted: false,
halt_reason: null,
trades_today: 0,
day_pnl: 0,
drawdown_pct: 0,
...overrides,
}
}
describe('aggregateStatus', () => {
it('returns the plain status when there is at most one strategy', () => {
expect(aggregateStatus(SINGLE, { strategies: [] })).toBe(SINGLE)
expect(aggregateStatus(SINGLE, { strategies: [strategy()] })).toBe(SINGLE)
})
it('sums the per-strategy numbers', () => {
const multi = {
running: true,
equity: 2100,
starting_balance: 2000,
total_pnl: 100,
price: 123,
strategies: [
strategy({ cash: 1000, equity: 1100, realized_pnl: 100, unrealized_pnl: 0, total_pnl: 100, trades_today: 2, open_positions: 1, day_pnl: 40 }),
strategy({ cash: 1000, equity: 1000, realized_pnl: 0, unrealized_pnl: 0, total_pnl: 0, trades_today: 0, open_positions: 0, day_pnl: -10 }),
],
}
const result = aggregateStatus(SINGLE, multi)
expect(result.cash).toBe(2000)
expect(result.equity).toBe(2100)
expect(result.realized_pnl).toBe(100)
expect(result.total_pnl).toBe(100)
expect(result.day_pnl).toBe(30)
expect(result.trades_today).toBe(2)
expect(result.open_positions).toBe(1)
expect(result.price).toBe(123)
expect(result.running).toBe(true)
})
it('reports the worst drawdown and any halt', () => {
const multi = {
running: true,
equity: 2000,
starting_balance: 2000,
total_pnl: 0,
price: null,
strategies: [
strategy({ drawdown_pct: 3, halted: false }),
strategy({ drawdown_pct: 7.5, halted: true, halt_reason: 'daily loss limit hit' }),
],
}
const result = aggregateStatus(SINGLE, multi)
expect(result.drawdown_pct).toBe(7.5)
expect(result.halted).toBe(true)
expect(result.halt_reason).toBe('daily loss limit hit')
})
it('falls back to the plain price when multi has none', () => {
const multi = {
running: false,
equity: 2000,
starting_balance: 2000,
total_pnl: 0,
price: null,
strategies: [strategy(), strategy()],
}
const result = aggregateStatus({ ...SINGLE, price: 99 }, multi)
expect(result.price).toBe(99)
})
})
+3
View File
@@ -5,12 +5,15 @@ const http = axios.create({ baseURL: '/api', timeout: 10000 })
export const getVersion = () => http.get('/version').then((r) => r.data)
export const getStatus = () => http.get('/status').then((r) => r.data)
export const getMultiStatus = () => http.get('/bot/status').then((r) => r.data)
export const getLiveCheck = () => http.get('/live-check').then((r) => r.data)
export const startMany = (payload) => http.post('/bot/start-many', payload).then((r) => r.data)
export const getStrategies = () => http.get('/strategies').then((r) => r.data)
export const getPositions = () => http.get('/positions').then((r) => r.data)
export const getOrders = () => http.get('/orders').then((r) => r.data)
export const getEvents = () => http.get('/events').then((r) => r.data)
export const getEquity = () => http.get('/equity').then((r) => r.data)
export const getLogs = (limit = 100) =>
http.get('/logs', { params: { limit } }).then((r) => r.data)
export const startBot = (payload) => http.post('/bot/start', payload).then((r) => r.data)
export const stopBot = () => http.post('/bot/stop').then((r) => r.data)
+73
View File
@@ -0,0 +1,73 @@
<script setup>
import { computed, onMounted, onUnmounted, ref } from 'vue'
import * as api from '../api'
import { fmtTime } from '../format'
import CollapsiblePanel from './CollapsiblePanel.vue'
const entries = ref([])
const levelFilter = ref('all')
let timer
const levelClass = {
info: 'text-slate-300',
warning: 'text-amber-300',
error: 'text-rose-300',
critical: 'text-rose-400',
debug: 'text-slate-500',
}
const filtered = computed(() => {
if (levelFilter.value === 'all') return entries.value
return entries.value.filter((e) => e.level === levelFilter.value)
})
async function load() {
try {
const data = await api.getLogs(200)
entries.value = data.entries || []
} catch {
// ignore transient errors
}
}
onMounted(() => {
load()
timer = setInterval(load, 5000)
})
onUnmounted(() => clearInterval(timer))
</script>
<template>
<CollapsiblePanel
title="Server logs"
storage-key="logs"
:default-open="false"
:summary="`${entries.length} lines`"
>
<div class="space-y-2">
<div class="flex items-center gap-2">
<label class="space-y-1">
<span class="label">Level</span>
<select v-model="levelFilter" class="input">
<option value="all">all</option>
<option value="info">info</option>
<option value="warning">warning</option>
<option value="error">error</option>
</select>
</label>
</div>
<div class="max-h-72 space-y-0.5 overflow-y-auto font-mono text-xs">
<div v-for="(e, i) in filtered" :key="i" class="flex gap-2 border-b border-edge/40 py-0.5">
<span class="shrink-0 text-slate-500">{{ fmtTime(e.time) }}</span>
<span class="shrink-0" :class="levelClass[e.level] || 'text-slate-300'">
[{{ e.level }}]
</span>
<span class="shrink-0 text-slate-500">{{ e.logger }}</span>
<span :class="levelClass[e.level] || 'text-slate-300'">{{ e.message }}</span>
</div>
<div v-if="!filtered.length" class="py-6 text-center text-slate-500">No log lines</div>
</div>
</div>
</CollapsiblePanel>
</template>
+39 -4
View File
@@ -7,10 +7,11 @@ import StrategyRowEditor from './StrategyRowEditor.vue'
const props = defineProps({
strategies: { type: Array, required: true },
multiStatus: { type: Object, required: true },
presets: { type: Array, default: () => [] },
busy: { type: Boolean, default: false },
loading: { type: Boolean, default: false },
})
const emit = defineEmits(['start-many', 'stop', 'kill'])
const emit = defineEmits(['start-many', 'stop', 'kill', 'save-preset', 'delete-preset'])
const startingBalance = ref(10000)
// Each row: { strategy_key, symbol, timeframe, weight, params }
@@ -64,6 +65,32 @@ function removeRow(index) {
rows.value.splice(index, 1)
}
// Load a saved preset as an additional row.
function loadPreset(event) {
const preset = props.presets.find((p) => p.id === Number(event.target.value))
event.target.value = ''
if (!preset) return
rows.value.push({
strategy_key: preset.strategy_key,
symbol: preset.symbol,
timeframe: preset.timeframe,
weight: 1,
params: { ...preset.params },
})
}
function saveRow(row) {
const name = window.prompt('Preset name', row.strategy_key)
if (name === null) return
emit('save-preset', {
name: name || row.strategy_key,
strategy_key: row.strategy_key,
symbol: row.symbol,
timeframe: row.timeframe,
params: row.params,
})
}
function start() {
emit('start-many', {
strategies: rows.value.map((r) => ({
@@ -85,7 +112,7 @@ function confirmKill() {
</script>
<template>
<CollapsiblePanel title="Strategies (multi)" storage-key="multi" :summary="summary">
<CollapsiblePanel title="Strategies" storage-key="strategies" :summary="summary">
<div class="space-y-3">
<div class="flex flex-wrap items-end gap-3">
<label class="space-y-1">
@@ -102,6 +129,15 @@ function confirmKill() {
<button class="btn-muted" :disabled="running || loading" @click="addRow">
Add strategy
</button>
<label v-if="presets.length" class="space-y-1">
<span class="label">Load preset</span>
<select class="input" :disabled="running || loading" @change="loadPreset">
<option value="">—</option>
<option v-for="p in presets" :key="p.id" :value="p.id">
{{ p.name || `${p.strategy_key} #${p.id}` }}
</option>
</select>
</label>
<button
class="btn-primary"
:disabled="busy || running || loading || !rows.length"
@@ -127,11 +163,10 @@ function confirmKill() {
:key="i"
v-model="rows[i]"
:strategies="strategies"
:default-symbol="multiStatus.symbol"
:default-timeframe="multiStatus.timeframe"
:disabled="running"
:allocation="allocations[i]"
@remove="removeRow(i)"
@save-preset="saveRow"
/>
</div>
<p v-else class="text-sm text-slate-400">
-58
View File
@@ -1,58 +0,0 @@
<script setup>
import { computed } from 'vue'
import CollapsiblePanel from './CollapsiblePanel.vue'
import StrategyForm from './StrategyForm.vue'
const props = defineProps({
strategies: { type: Array, required: true },
status: { type: Object, required: true },
busy: { type: Boolean, default: false },
presets: { type: Array, default: () => [] },
loading: { type: Boolean, default: false },
})
const emit = defineEmits(['start', 'stop', 'kill', 'save-preset', 'delete-preset'])
const summary = computed(() => {
const name = props.status.strategy_name || 'none'
return `${name} · ${props.status.running ? 'running' : 'stopped'}`
})
function confirmKill() {
if (window.confirm('Kill switch: flatten the position and halt trading?')) {
emit('kill')
}
}
</script>
<template>
<CollapsiblePanel title="Strategy" storage-key="strategy" :summary="summary">
<div class="space-y-3">
<StrategyForm
:strategies="strategies"
:disabled="status.running"
:busy="busy"
submit-label="Start bot"
:symbol="status.symbol"
:timeframe="status.timeframe"
:presets="presets"
:loading="loading"
@submit="emit('start', $event)"
@save-preset="emit('save-preset', $event)"
@delete-preset="emit('delete-preset', $event)"
/>
<div class="flex flex-wrap gap-2">
<button class="btn-danger" :disabled="busy || !status.running" @click="emit('stop')">
Stop bot
</button>
<button
class="btn bg-rose-700 font-bold uppercase text-white hover:bg-rose-600"
:disabled="busy || (!status.running && status.open_positions === 0)"
@click="confirmKill"
>
Kill switch
</button>
</div>
</div>
</CollapsiblePanel>
</template>
@@ -4,13 +4,11 @@ import { computed, ref, watch } from 'vue'
const props = defineProps({
modelValue: { type: Object, required: true },
strategies: { type: Array, required: true },
defaultSymbol: { type: String, default: 'BTC/USDT' },
defaultTimeframe: { type: String, default: '5m' },
disabled: { type: Boolean, default: false },
// Share of the total balance this row will receive (0..1), for display.
allocation: { type: Number, default: 0 },
})
const emit = defineEmits(['update:modelValue', 'remove'])
const emit = defineEmits(['update:modelValue', 'remove', 'save-preset'])
const row = computed(() => props.modelValue)
const selected = computed(() => props.strategies.find((s) => s.key === row.value.strategy_key))
@@ -115,7 +113,8 @@ watch(
</label>
</div>
<div class="mt-2 flex justify-end">
<div class="mt-2 flex justify-end gap-2">
<button class="btn-muted" :disabled="disabled" @click="emit('save-preset', row)">Save</button>
<button class="btn-muted" :disabled="disabled" @click="emit('remove')">Remove</button>
</div>
</div>
+51 -3
View File
@@ -1,7 +1,11 @@
import { mount } from '@vue/test-utils'
import { describe, expect, it } from 'vitest'
import { afterEach, describe, expect, it, vi } from 'vitest'
import MultiStrategyPanel from './components/MultiStrategyPanel.vue'
afterEach(() => {
vi.restoreAllMocks()
})
const STRATEGIES = [
{
key: 'sma_cross',
@@ -19,9 +23,20 @@ const STRATEGIES = [
const EMPTY_STATUS = { running: false, strategies: [], total_pnl: 0, equity: 0 }
function mountPanel(multiStatus = EMPTY_STATUS) {
const PRESETS = [
{
id: 1,
name: 'BTC fast',
strategy_key: 'ema_cross',
symbol: 'ETH/USDT',
timeframe: '15m',
params: { fast: 3 },
},
]
function mountPanel(multiStatus = EMPTY_STATUS, presets = []) {
return mount(MultiStrategyPanel, {
props: { strategies: STRATEGIES, multiStatus, busy: false, loading: false },
props: { strategies: STRATEGIES, multiStatus, presets, busy: false, loading: false },
})
}
@@ -89,6 +104,39 @@ describe('MultiStrategyPanel', () => {
expect(text).toContain('running')
})
it('loads a preset as an additional row', async () => {
const wrapper = mountPanel(EMPTY_STATUS, PRESETS)
const presetSelect = wrapper.findAll('select').find((s) => s.text().includes('BTC fast'))
expect(presetSelect).toBeTruthy()
await presetSelect.setValue('1')
// A second row now exists, seeded from the preset.
expect(wrapper.findAll('select').length).toBeGreaterThan(1)
const inputs = wrapper.findAll('input')
expect(inputs.some((i) => i.element.value === 'ETH/USDT')).toBe(true)
expect(inputs.some((i) => i.element.value === '15m')).toBe(true)
})
it('emits save-preset with the row config', async () => {
vi.spyOn(window, 'prompt').mockReturnValue('my preset')
const wrapper = mountPanel()
const save = wrapper.findAll('button').find((b) => b.text() === 'Save')
await save.trigger('click')
const payload = wrapper.emitted('save-preset')[0][0]
expect(payload.name).toBe('my preset')
expect(payload.strategy_key).toBe('sma_cross')
expect(payload.params).toEqual({ fast: 10 })
})
it('does not save when the prompt is cancelled', async () => {
vi.spyOn(window, 'prompt').mockReturnValue(null)
const wrapper = mountPanel()
const save = wrapper.findAll('button').find((b) => b.text() === 'Save')
await save.trigger('click')
expect(wrapper.emitted('save-preset')).toBeUndefined()
})
it('marks a halted strategy', () => {
const wrapper = mountPanel({
running: true,
-48
View File
@@ -1,48 +0,0 @@
import { mount } from '@vue/test-utils'
import { describe, expect, it } from 'vitest'
import StrategyPanel from './components/StrategyPanel.vue'
function mountPanel() {
return mount(StrategyPanel, {
props: {
strategies: [
{
key: 'sma_cross',
name: 'SMA Crossover',
description: 'test',
params: [{ name: 'fast', type: 'int', default: 10, description: '' }],
},
],
status: { running: false, symbol: 'BTC/USDT', timeframe: '5m', open_positions: 0 },
busy: false,
presets: [],
},
})
}
describe('StrategyPanel collapse', () => {
it('shows the strategy form by default', () => {
const wrapper = mountPanel()
expect(wrapper.find('select').exists()).toBe(true)
})
it('hides the form when the header is clicked', async () => {
const wrapper = mountPanel()
const header = wrapper.find('button')
expect(header.attributes('aria-expanded')).toBe('true')
await header.trigger('click')
expect(wrapper.find('button').attributes('aria-expanded')).toBe('false')
// The form container is v-show-hidden, so the select is no longer visible.
const hidden = wrapper.findAll('div').some((d) => d.element.style.display === 'none')
expect(hidden).toBe(true)
})
it('picks the first strategy so the dropdown is populated', () => {
const wrapper = mountPanel()
const select = wrapper.find('select')
expect(select.element.value).toBe('sma_cross')
expect(select.findAll('option')).toHaveLength(1)
})
})