From 69e88b3b353f1a2ab7a78259b480e8afbd87669c Mon Sep 17 00:00:00 2001 From: TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> Date: Wed, 1 Apr 2026 17:46:47 +0900 Subject: fix: snapshot delay, env fields, alembic creds, API healthcheck and error handling --- services/api/src/trading_api/routers/orders.py | 90 ++++++++++++---------- services/api/src/trading_api/routers/portfolio.py | 64 ++++++++------- services/api/src/trading_api/routers/strategies.py | 33 ++++---- 3 files changed, 109 insertions(+), 78 deletions(-) (limited to 'services/api') diff --git a/services/api/src/trading_api/routers/orders.py b/services/api/src/trading_api/routers/orders.py index d0b9fa6..c69dc10 100644 --- a/services/api/src/trading_api/routers/orders.py +++ b/services/api/src/trading_api/routers/orders.py @@ -1,55 +1,67 @@ """Order endpoints.""" -from fastapi import APIRouter, Request +import logging + +from fastapi import APIRouter, HTTPException, Request from shared.sa_models import OrderRow, SignalRow from sqlalchemy import select +logger = logging.getLogger(__name__) + router = APIRouter() @router.get("/") async def get_orders(request: Request, limit: int = 50): """Get recent orders.""" - db = request.app.state.db - async with db.get_session() as session: - stmt = select(OrderRow).order_by(OrderRow.created_at.desc()).limit(limit) - result = await session.execute(stmt) - rows = result.scalars().all() - return [ - { - "id": r.id, - "signal_id": r.signal_id, - "symbol": r.symbol, - "side": r.side, - "type": r.type, - "price": float(r.price), - "quantity": float(r.quantity), - "status": r.status, - "created_at": r.created_at.isoformat() if r.created_at else None, - "filled_at": r.filled_at.isoformat() if r.filled_at else None, - } - for r in rows - ] + try: + db = request.app.state.db + async with db.get_session() as session: + stmt = select(OrderRow).order_by(OrderRow.created_at.desc()).limit(limit) + result = await session.execute(stmt) + rows = result.scalars().all() + return [ + { + "id": r.id, + "signal_id": r.signal_id, + "symbol": r.symbol, + "side": r.side, + "type": r.type, + "price": float(r.price), + "quantity": float(r.quantity), + "status": r.status, + "created_at": r.created_at.isoformat() if r.created_at else None, + "filled_at": r.filled_at.isoformat() if r.filled_at else None, + } + for r in rows + ] + except Exception as exc: + logger.error("Failed to get orders: %s", exc) + raise HTTPException(status_code=500, detail="Failed to retrieve orders") @router.get("/signals") async def get_signals(request: Request, limit: int = 50): """Get recent signals.""" - db = request.app.state.db - async with db.get_session() as session: - stmt = select(SignalRow).order_by(SignalRow.created_at.desc()).limit(limit) - result = await session.execute(stmt) - rows = result.scalars().all() - return [ - { - "id": r.id, - "strategy": r.strategy, - "symbol": r.symbol, - "side": r.side, - "price": float(r.price), - "quantity": float(r.quantity), - "reason": r.reason, - "created_at": r.created_at.isoformat() if r.created_at else None, - } - for r in rows - ] + try: + db = request.app.state.db + async with db.get_session() as session: + stmt = select(SignalRow).order_by(SignalRow.created_at.desc()).limit(limit) + result = await session.execute(stmt) + rows = result.scalars().all() + return [ + { + "id": r.id, + "strategy": r.strategy, + "symbol": r.symbol, + "side": r.side, + "price": float(r.price), + "quantity": float(r.quantity), + "reason": r.reason, + "created_at": r.created_at.isoformat() if r.created_at else None, + } + for r in rows + ] + except Exception as exc: + logger.error("Failed to get signals: %s", exc) + raise HTTPException(status_code=500, detail="Failed to retrieve signals") diff --git a/services/api/src/trading_api/routers/portfolio.py b/services/api/src/trading_api/routers/portfolio.py index 3b30e1d..d76d85d 100644 --- a/services/api/src/trading_api/routers/portfolio.py +++ b/services/api/src/trading_api/routers/portfolio.py @@ -1,42 +1,54 @@ """Portfolio endpoints.""" -from fastapi import APIRouter, Request +import logging + +from fastapi import APIRouter, HTTPException, Request from shared.sa_models import PositionRow from sqlalchemy import select +logger = logging.getLogger(__name__) + router = APIRouter() @router.get("/positions") async def get_positions(request: Request): """Get all current positions.""" - db = request.app.state.db - async with db.get_session() as session: - result = await session.execute(select(PositionRow)) - rows = result.scalars().all() - return [ - { - "symbol": r.symbol, - "quantity": float(r.quantity), - "avg_entry_price": float(r.avg_entry_price), - "current_price": float(r.current_price), - "unrealized_pnl": float(r.quantity * (r.current_price - r.avg_entry_price)), - } - for r in rows - ] + try: + db = request.app.state.db + async with db.get_session() as session: + result = await session.execute(select(PositionRow)) + rows = result.scalars().all() + return [ + { + "symbol": r.symbol, + "quantity": float(r.quantity), + "avg_entry_price": float(r.avg_entry_price), + "current_price": float(r.current_price), + "unrealized_pnl": float(r.quantity * (r.current_price - r.avg_entry_price)), + } + for r in rows + ] + except Exception as exc: + logger.error("Failed to get positions: %s", exc) + raise HTTPException(status_code=500, detail="Failed to retrieve positions") @router.get("/snapshots") async def get_snapshots(request: Request, days: int = 30): """Get portfolio snapshots for the last N days.""" - db = request.app.state.db - snapshots = await db.get_portfolio_snapshots(days=days) - return [ - { - "total_value": float(s["total_value"]), - "realized_pnl": float(s["realized_pnl"]), - "unrealized_pnl": float(s["unrealized_pnl"]), - "snapshot_at": s["snapshot_at"].isoformat(), - } - for s in snapshots - ] + try: + db = request.app.state.db + snapshots = await db.get_portfolio_snapshots(days=days) + return [ + { + "total_value": float(s["total_value"]), + "realized_pnl": float(s["realized_pnl"]), + "unrealized_pnl": float(s["unrealized_pnl"]), + "snapshot_at": s["snapshot_at"].isoformat(), + } + for s in snapshots + ] + except Exception as exc: + logger.error("Failed to get snapshots: %s", exc) + raise HTTPException(status_code=500, detail="Failed to retrieve snapshots") diff --git a/services/api/src/trading_api/routers/strategies.py b/services/api/src/trading_api/routers/strategies.py index 2861eec..e968529 100644 --- a/services/api/src/trading_api/routers/strategies.py +++ b/services/api/src/trading_api/routers/strategies.py @@ -1,30 +1,37 @@ """Strategy endpoints.""" +import logging import sys from pathlib import Path -from fastapi import APIRouter +from fastapi import APIRouter, HTTPException # Add strategy-engine to path for plugin loading _STRATEGY_DIR = Path(__file__).resolve().parents[5] / "strategy-engine" if str(_STRATEGY_DIR) not in sys.path: sys.path.insert(0, str(_STRATEGY_DIR)) +logger = logging.getLogger(__name__) + router = APIRouter() @router.get("/") async def list_strategies(): """List available strategies.""" - from strategy_engine.plugin_loader import load_strategies - - strategies_dir = _STRATEGY_DIR / "strategies" - strategies = load_strategies(strategies_dir) - return [ - { - "name": s.name, - "warmup_period": s.warmup_period, - "class": type(s).__name__, - } - for s in strategies - ] + try: + from strategy_engine.plugin_loader import load_strategies + + strategies_dir = _STRATEGY_DIR / "strategies" + strategies = load_strategies(strategies_dir) + return [ + { + "name": s.name, + "warmup_period": s.warmup_period, + "class": type(s).__name__, + } + for s in strategies + ] + except Exception as exc: + logger.error("Failed to list strategies: %s", exc) + raise HTTPException(status_code=500, detail="Failed to list strategies") -- cgit v1.2.3