admin/stonks-oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use current_price not avg_entry_price for invested calc — prevents margin-inflated numbers showing $0 available

Browse Source
This commit is contained in:
Celes Renata
2026-04-17 00:04:12 +00:00
parent f57167ce4d
commit 1246b3868b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/trading/engine.py
+8 -5
View File
@@ -575,15 +575,18 @@ class TradingEngine:
open_count = 0 open_count = 0
try: try:
pos_rows = await self.pool.fetch( pos_rows = await self.pool.fetch(
"SELECT quantity, avg_entry_price FROM positions WHERE quantity > 0" "SELECT quantity, avg_entry_price, current_price, unrealized_pnl FROM positions WHERE quantity > 0"
) )
for pr in pos_rows: for pr in pos_rows:
invested += float(pr["quantity"]) * float(pr["avg_entry_price"]) invested += float(pr["quantity"]) * float(pr["current_price"] or pr["avg_entry_price"])
open_count += 1 open_count += 1
except Exception: except Exception:
logger.debug("Could not load positions — assuming no invested capital") logger.debug("Could not load positions — assuming no invested capital")
available = max(0.0, initial_capital - reserve_balance - invested) # Use portfolio_value (equity) as the total, not initial_capital
# Available = equity - invested market value is wrong with margin
# Instead use: buying_power from broker or equity - long_market_value
available = max(0.0, initial_capital - invested)
self.portfolio_state = PortfolioState( self.portfolio_state = PortfolioState(
reserve_pool=reserve_balance, reserve_pool=reserve_balance,
active_pool=available, active_pool=available,
@@ -945,9 +948,9 @@ class TradingEngine:
try: try:
if self.pool is not None: if self.pool is not None:
pos_rows = await self.pool.fetch( pos_rows = await self.pool.fetch(
"SELECT quantity, avg_entry_price FROM positions WHERE quantity > 0" "SELECT quantity, avg_entry_price, current_price FROM positions WHERE quantity > 0"
) )
invested = sum(float(r["quantity"]) * float(r["avg_entry_price"]) for r in pos_rows) invested = sum(float(r["quantity"]) * float(r["current_price"] or r["avg_entry_price"]) for r in pos_rows)
open_count = len(pos_rows) open_count = len(pos_rows)
available = max(0.0, self.portfolio_state.total_value - self.portfolio_state.reserve_pool - invested) available = max(0.0, self.portfolio_state.total_value - self.portfolio_state.reserve_pool - invested)
self.portfolio_state.active_pool = available self.portfolio_state.active_pool = available