mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify trade_model serializations

Browse Source
This commit is contained in:
Matthias
2024-02-15 19:52:50 +01:00
committed by Joe Schr
parent cb95298936
commit d004509176
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/persistence/trade_model.py
+5 -8
View File
@@ -23,7 +23,7 @@ from freqtrade.exchange import (ROUND_DOWN, ROUND_UP, amount_to_contract_precisi
from freqtrade.leverage import interest from freqtrade.leverage import interest
from freqtrade.misc import safe_value_fallback from freqtrade.misc import safe_value_fallback
from freqtrade.persistence.base import ModelBase, SessionType from freqtrade.persistence.base import ModelBase, SessionType
from freqtrade.util import FtPrecise, dt_from_ts, dt_now, dt_ts from freqtrade.util import FtPrecise, dt_from_ts, dt_now, dt_ts, dt_ts_none
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -224,8 +224,7 @@ class Order(ModelBase):
'amount': self.safe_amount, 'amount': self.safe_amount,
'safe_price': self.safe_price, 'safe_price': self.safe_price,
'ft_order_side': self.ft_order_side, 'ft_order_side': self.ft_order_side,
'order_filled_timestamp': int(self.order_filled_date.replace( 'order_filled_timestamp': dt_ts_none(self.order_filled_utc),
tzinfo=timezone.utc).timestamp() * 1000) if self.order_filled_date else None,
'ft_is_entry': self.ft_order_side == entry_side, 'ft_is_entry': self.ft_order_side == entry_side,
'ft_order_tag': self.ft_order_tag, 'ft_order_tag': self.ft_order_tag,
} }
@@ -625,15 +624,14 @@ class LocalTrade:
'fee_close_currency': self.fee_close_currency, 'fee_close_currency': self.fee_close_currency,
'open_date': self.open_date.strftime(DATETIME_PRINT_FORMAT), 'open_date': self.open_date.strftime(DATETIME_PRINT_FORMAT),
'open_timestamp': int(self.open_date.replace(tzinfo=timezone.utc).timestamp() * 1000), 'open_timestamp': dt_ts_none(self.open_date_utc),
'open_rate': self.open_rate, 'open_rate': self.open_rate,
'open_rate_requested': self.open_rate_requested, 'open_rate_requested': self.open_rate_requested,
'open_trade_value': round(self.open_trade_value, 8), 'open_trade_value': round(self.open_trade_value, 8),
'close_date': (self.close_date.strftime(DATETIME_PRINT_FORMAT) 'close_date': (self.close_date.strftime(DATETIME_PRINT_FORMAT)
if self.close_date else None), if self.close_date else None),
'close_timestamp': int(self.close_date.replace( 'close_timestamp': dt_ts_none(self.close_date_utc),
tzinfo=timezone.utc).timestamp() * 1000) if self.close_date else None,
'realized_profit': self.realized_profit or 0.0, 'realized_profit': self.realized_profit or 0.0,
# Close-profit corresponds to relative realized_profit ratio # Close-profit corresponds to relative realized_profit ratio
'realized_profit_ratio': self.close_profit or None, 'realized_profit_ratio': self.close_profit or None,
@@ -659,8 +657,7 @@ class LocalTrade:
'stop_loss_pct': (self.stop_loss_pct * 100) if self.stop_loss_pct else None, 'stop_loss_pct': (self.stop_loss_pct * 100) if self.stop_loss_pct else None,
'stoploss_last_update': (self.stoploss_last_update_utc.strftime(DATETIME_PRINT_FORMAT) 'stoploss_last_update': (self.stoploss_last_update_utc.strftime(DATETIME_PRINT_FORMAT)
if self.stoploss_last_update_utc else None), if self.stoploss_last_update_utc else None),
'stoploss_last_update_timestamp': int(self.stoploss_last_update_utc.timestamp() * 1000 'stoploss_last_update_timestamp': dt_ts_none(self.stoploss_last_update_utc),
) if self.stoploss_last_update_utc else None,
'initial_stop_loss_abs': self.initial_stop_loss, 'initial_stop_loss_abs': self.initial_stop_loss,
'initial_stop_loss_ratio': (self.initial_stop_loss_pct 'initial_stop_loss_ratio': (self.initial_stop_loss_pct
if self.initial_stop_loss_pct else None), if self.initial_stop_loss_pct else None),