adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fun with types

Browse Source
This commit is contained in:
Matthias 2023-02-16 08:40:34 +00:00
parent 491f49388c
commit 47b66f3220
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freqtrade/persistence/trade_model.py
View File

@ -1183,8 +1183,8 @@ class Trade(ModelBase, LocalTrade):
exchange: Mapped[str] = mapped_column(String(25), nullable=False) exchange: Mapped[str] = mapped_column(String(25), nullable=False)
pair: Mapped[str] = mapped_column(String(25), nullable=False, index=True) pair: Mapped[str] = mapped_column(String(25), nullable=False, index=True)
base_currency = mapped_column(String(25), nullable=True) base_currency: Mapped[Optional[str]] = mapped_column(String(25), nullable=True)
stake_currency = mapped_column(String(25), nullable=True) stake_currency: Mapped[Optional[str]] = mapped_column(String(25), nullable=True)
is_open: Mapped[bool] = mapped_column(nullable=False, default=True, index=True) is_open: Mapped[bool] = mapped_column(nullable=False, default=True, index=True)
fee_open: Mapped[float] = mapped_column(Float(), nullable=False, default=0.0) fee_open: Mapped[float] = mapped_column(Float(), nullable=False, default=0.0)
fee_open_cost: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) fee_open_cost: Mapped[Optional[float]] = mapped_column(Float(), nullable=True)
@ -1209,7 +1209,7 @@ class Trade(ModelBase, LocalTrade):
close_date: Mapped[Optional[datetime]] = mapped_column() close_date: Mapped[Optional[datetime]] = mapped_column()
open_order_id: Mapped[Optional[str]] = mapped_column(String(255), nullable=True) open_order_id: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
# absolute value of the stop loss # absolute value of the stop loss
stop_loss: Mapped[Optional[float]] = mapped_column(Float(), nullable=True, default=0.0) stop_loss: Mapped[float] = mapped_column(Float(), nullable=True, default=0.0)
# percentage value of the stop loss # percentage value of the stop loss
stop_loss_pct: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) stop_loss_pct: Mapped[Optional[float]] = mapped_column(Float(), nullable=True)
# absolute value of the initial stop loss # absolute value of the initial stop loss
@ -1230,14 +1230,14 @@ class Trade(ModelBase, LocalTrade):
enter_tag: Mapped[Optional[str]] = mapped_column(String(100), nullable=True) enter_tag: Mapped[Optional[str]] = mapped_column(String(100), nullable=True)
timeframe: Mapped[Optional[int]] = mapped_column(Integer, nullable=True) timeframe: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
trading_mode = mapped_column(Enum(TradingMode), nullable=True) trading_mode: Mapped[TradingMode] = mapped_column(Enum(TradingMode), nullable=True)
amount_precision: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) amount_precision: Mapped[Optional[float]] = mapped_column(Float(), nullable=True)
price_precision: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) price_precision: Mapped[Optional[float]] = mapped_column(Float(), nullable=True)
precision_mode: Mapped[Optional[int]] = mapped_column(Integer, nullable=True) precision_mode: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
contract_size: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) contract_size: Mapped[Optional[float]] = mapped_column(Float(), nullable=True)
# Leverage trading properties # Leverage trading properties
leverage: Mapped[Optional[float]] = mapped_column(Float(), nullable=True, default=1.0) leverage: Mapped[float] = mapped_column(Float(), nullable=True, default=1.0)
is_short: Mapped[bool] = mapped_column(nullable=False, default=False) is_short: Mapped[bool] = mapped_column(nullable=False, default=False)
liquidation_price: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) liquidation_price: Mapped[Optional[float]] = mapped_column(Float(), nullable=True)

2
freqtrade/rpc/rpc.py
View File

@ -506,7 +506,7 @@ class RPC:
trades_df = DataFrame([{'close_date': trade.close_date.strftime(DATETIME_PRINT_FORMAT), trades_df = DataFrame([{'close_date': trade.close_date.strftime(DATETIME_PRINT_FORMAT),
'profit_abs': trade.close_profit_abs} 'profit_abs': trade.close_profit_abs}
for trade in trades if not trade.is_open]) for trade in trades if not trade.is_open and trade.close_date])
max_drawdown_abs = 0.0 max_drawdown_abs = 0.0
max_drawdown = 0.0 max_drawdown = 0.0
if len(trades_df) > 0: if len(trades_df) > 0: