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

Improve logic for from_json special case

Browse Source
This commit is contained in:
Matthias
2023-07-15 15:18:03 +02:00
parent d1662db813
commit ff14208105
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/persistence/trade_model.py
+6 -5
View File
@@ -1299,12 +1299,12 @@ class Trade(ModelBase, LocalTrade):
Float(), nullable=True, default=None) # type: ignore Float(), nullable=True, default=None) # type: ignore
def __init__(self, **kwargs): def __init__(self, **kwargs):
from_json = kwargs.pop('__FROM_JSON', None)
super().__init__(**kwargs) super().__init__(**kwargs)
self.realized_profit = 0 if not from_json:
self.recalc_open_trade_value() # Skip recalculation when loading from json
if 'realized_profit' in kwargs: self.realized_profit = 0
# reset realized profit for from_json calls self.recalc_open_trade_value()
self.realized_profit = kwargs['realized_profit']
@validates('enter_tag', 'exit_reason') @validates('enter_tag', 'exit_reason')
def validate_string_len(self, key, value): def validate_string_len(self, key, value):
@@ -1658,6 +1658,7 @@ class Trade(ModelBase, LocalTrade):
import rapidjson import rapidjson
data = rapidjson.loads(json_str) data = rapidjson.loads(json_str)
trade = cls( trade = cls(
__FROM_JSON=True,
id=data["trade_id"], id=data["trade_id"],
pair=data["pair"], pair=data["pair"],
base_currency=data["base_currency"], base_currency=data["base_currency"],