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

Allow user to user pair_dict for persistent storage of custom data

Browse Source
This commit is contained in:
robcaulk 2022-08-09 16:03:10 +02:00
parent aef086b02e
commit e7de812948
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/freqai/data_drawer.py
View File

@ -31,6 +31,7 @@ class pair_info(TypedDict):
trained_timestamp: int trained_timestamp: int
priority: int priority: int
data_path: str data_path: str
extras: dict
class FreqaiDataDrawer: class FreqaiDataDrawer:
@ -87,7 +88,7 @@ class FreqaiDataDrawer:
self.old_DBSCAN_eps: Dict[str, float] = {} self.old_DBSCAN_eps: Dict[str, float] = {}
self.empty_pair_dict: pair_info = { self.empty_pair_dict: pair_info = {
"model_filename": "", "trained_timestamp": 0, "model_filename": "", "trained_timestamp": 0,
"priority": 1, "first": True, "data_path": ""} "priority": 1, "first": True, "data_path": "", "extras": {}}
def load_drawer_from_disk(self): def load_drawer_from_disk(self):
""" """

8
freqtrade/templates/FreqaiExampleStrategy.py
View File

@ -252,16 +252,16 @@ class FreqaiExampleStrategy(IStrategy):
if ( if (
"prediction" + entry_tag not in pair_dict[pair] "prediction" + entry_tag not in pair_dict[pair]
or pair_dict[pair]["prediction" + entry_tag] == 0 or pair_dict[pair]['extras']["prediction" + entry_tag] == 0
): ):
with self.freqai.lock: with self.freqai.lock:
pair_dict[pair]["prediction" + entry_tag] = abs(trade_candle["&-s_close"]) pair_dict[pair]['extras']["prediction" + entry_tag] = abs(trade_candle["&-s_close"])
if not follow_mode: if not follow_mode:
self.freqai.dd.save_drawer_to_disk() self.freqai.dd.save_drawer_to_disk()
else: else:
self.freqai.dd.save_follower_dict_to_disk() self.freqai.dd.save_follower_dict_to_disk()
roi_price = pair_dict[pair]["prediction" + entry_tag] roi_price = pair_dict[pair]['extras']["prediction" + entry_tag]
roi_time = self.max_roi_time_long.value roi_time = self.max_roi_time_long.value
roi_decay = roi_price * ( roi_decay = roi_price * (
@ -299,7 +299,7 @@ class FreqaiExampleStrategy(IStrategy):
pair_dict = self.freqai.dd.follower_dict pair_dict = self.freqai.dd.follower_dict
with self.freqai.lock: with self.freqai.lock:
pair_dict[pair]["prediction" + entry_tag] = 0 pair_dict[pair]['extras']["prediction" + entry_tag] = 0
if not follow_mode: if not follow_mode:
self.freqai.dd.save_drawer_to_disk() self.freqai.dd.save_drawer_to_disk()
else: else: