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

refactor: move error handling up to more appropiate place

Browse Source
This commit is contained in:
Joe Schr 2021-09-01 10:42:55 +02:00
parent 75c9a3234a
commit 86c8ed5465
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freqtrade/strategy/strategy_helper.py
View File

@ -115,18 +115,18 @@ def get_buy_candle(dataframe, trade: Trade, timeframe: str, now: datetime = None
def find_candle_datetime(dataframe: pd.DataFrame, timeframe: str, query_date: datetime, pair: str, now: datetime = None): def find_candle_datetime(dataframe: pd.DataFrame, timeframe: str, query_date: datetime, pair: str, now: datetime = None):
result = None result = None
candle = find_candle_datetime_safer(dataframe, query_date) try:
# candle = find_candle_datetime_faster(dataframe, timeframe, query_date, now) candle = find_candle_datetime_safer(dataframe, query_date)
result = candle if candle.empty else candle.squeeze() result = candle if candle.empty else candle.squeeze()
# query_date may not exist yet, e.g. if using trade.open_date
except KeyError:
result = None
return result return result
def find_candle_datetime_safer(dataframe: pd.DataFrame, query_date: datetime): def find_candle_datetime_safer(dataframe: pd.DataFrame, query_date: datetime):
df = dataframe[['date']].set_index('date') df = dataframe[['date']].set_index('date')
try: date_mask = df.index.unique().get_loc(query_date, method='ffill')
date_mask = df.index.unique().get_loc(query_date, method='ffill') candle = dataframe.iloc[date_mask] # use iloc because date_mask maybe :int
candle = dataframe.iloc[date_mask] # use iloc because date_mask maybe :int
except KeyError: # trade.open_date may not exist yet
candle = pd.DataFrame(index=dataframe.index)
return candle return candle