Bobby/stock_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Improve trade direction handling and add debug output

Browse Source
This commit is contained in:
Bobby (aider) 2025-02-13 09:02:42 -08:00
parent 3bc111288e
commit 58c59a4633
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/pages/journal/trading_journal_page.py
View File

@ -17,17 +17,25 @@ def calculate_position_performance(trades):
total_proceeds = 0 total_proceeds = 0
for trade in trades: for trade in trades:
if trade['direction'] == 'buy': # Debug print to see what we're getting
print(f"Processing trade: {trade}")
# Convert direction to lowercase and strip whitespace
direction = str(trade.get('direction', '')).lower().strip()
try:
shares = float(trade['shares']) shares = float(trade['shares'])
price = float(trade['entry_price']) price = float(trade['entry_price'])
if direction == 'buy':
total_bought += shares total_bought += shares
total_cost += shares * price total_cost += shares * price
elif trade['direction'] == 'sell': elif direction == 'sell':
shares = float(trade['shares'])
# For sells, use exit_price if available, otherwise use entry_price
price = float(trade['exit_price']) if trade.get('exit_price') else float(trade['entry_price'])
total_sold += shares total_sold += shares
total_proceeds += shares * price total_proceeds += shares * price
except (ValueError, TypeError) as e:
print(f"Error processing trade: {e}")
continue
# Avoid division by zero # Avoid division by zero
if total_bought == 0: if total_bought == 0:
@ -40,7 +48,7 @@ def calculate_position_performance(trades):
'remaining_shares': 0 'remaining_shares': 0
} }
avg_entry = total_cost / total_bought avg_entry = total_cost / total_bought if total_bought > 0 else 0
avg_exit = total_proceeds / total_sold if total_sold > 0 else 0 avg_exit = total_proceeds / total_sold if total_sold > 0 else 0
realized_pl = total_proceeds - (total_sold / total_bought * total_cost) if total_sold > 0 else 0 realized_pl = total_proceeds - (total_sold / total_bought * total_cost) if total_sold > 0 else 0
remaining_shares = total_bought - total_sold remaining_shares = total_bought - total_sold
@ -381,10 +389,23 @@ def trading_journal_page():
st.markdown("---") st.markdown("---")
# Debug output
st.write("Raw trade data:")
for trade in trades:
st.write({
'direction': trade.get('direction'),
'shares': trade.get('shares'),
'entry_price': trade.get('entry_price'),
'entry_date': trade.get('entry_date')
})
# Show buy trades # Show buy trades
st.subheader("Buy Orders") st.subheader("Buy Orders")
for trade in trades: for trade in trades:
if trade['direction'] == 'buy': # Convert direction to lowercase and strip whitespace
direction = str(trade.get('direction', '')).lower().strip()
if direction == 'buy':
col1, col2, col3 = st.columns(3) col1, col2, col3 = st.columns(3)
with col1: with col1:
st.text(f"Date: {format_datetime(trade['entry_date'])}") st.text(f"Date: {format_datetime(trade['entry_date'])}")
@ -404,7 +425,10 @@ def trading_journal_page():
# Show sell trades # Show sell trades
st.subheader("Sell Orders") st.subheader("Sell Orders")
for trade in trades: for trade in trades:
if trade['direction'] == 'sell': # Convert direction to lowercase and strip whitespace
direction = str(trade.get('direction', '')).lower().strip()
if direction == 'sell':
col1, col2 = st.columns(2) col1, col2 = st.columns(2)
with col1: with col1:
st.text(f"Date: {format_datetime(trade['entry_date'])}") st.text(f"Date: {format_datetime(trade['entry_date'])}")