Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Community] handle candles history fetch #2449

Merged
merged 2 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 85 additions & 0 deletions octobot/community/supabase_backend/community_supabase_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import octobot_commons.authentication as authentication
import octobot_commons.logging as commons_logging
import octobot_commons.profiles as commons_profiles
import octobot_commons.enums as commons_enums
import octobot_commons.constants as commons_constants
import octobot.constants as constants
import octobot.community.errors as errors
import octobot.community.supabase_backend.enums as enums
Expand Down Expand Up @@ -322,6 +324,89 @@ async def upsert_portfolio_history(self, portfolio_histories) -> list:
on_conflict=f"{enums.PortfolioHistoryKeys.TIME.value},{enums.PortfolioHistoryKeys.PORTFOLIO_ID.value}"
).execute()).data

async def fetch_candles_history_range(
self, exchange: str, symbol: str, time_frame: commons_enums.TimeFrames
) -> (typing.Union[float, None], typing.Union[float, None]):
min_max = json.loads(
(await self.postgres_functions().invoke(
"get_ohlcv_range",
{"body": {
"exchange_internal_name": exchange,
"symbol": symbol,
"time_frame": time_frame.value,
}}
))["data"]
)[0]
return (
self.get_parsed_time(min_max["min_value"]).timestamp() if min_max["min_value"] else None,
self.get_parsed_time(min_max["max_value"]).timestamp() if min_max["max_value"] else None,
)

async def fetch_candles_history(
self, exchange: str, symbol: str, time_frame: commons_enums.TimeFrames,
first_open_time: float, last_open_time: float
) -> list:
total_candles_count = (last_open_time - first_open_time) // (
commons_enums.TimeFramesMinutes[time_frame] * commons_constants.MINUTE_TO_SECONDS
)
offset = 0
max_size = 0
total_candles = []
max_requests_count = 100
request_count = 0
while request_count < max_requests_count:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to do multiple requests?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

supabases has a max of rows returned by one query (1000 by default), here we want approx 18k rows for 15min over 6m

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And why not increasing supabase's limit?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

according to supabase this value should not be too high as it can take a lot of computing power from the db and be an attack vector. We can increase it though, this code will just adapt

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok thanks for the explanation 👍

Copy link
Member

@Herklos Herklos Oct 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we catch if a request fails to not stop the whole loop or it's ok to raise?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we would need a retry mechanism. I havn't seen it happen yet, do you think we should add it ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably wait for it to happen a first time

request = (
self.table("temp_ohlcv_history").select("*")
.match({
"exchange_internal_name": exchange,
"symbol": symbol,
"time_frame": time_frame.value,
}).gte(
"timestamp", self.get_formatted_time(first_open_time)
).lte(
"timestamp", self.get_formatted_time(last_open_time)
).order(
"timestamp", desc=False
)
)
if offset:
request = request.range(offset, offset+max_size)
fetched_candles = (await request.execute()).data
total_candles += fetched_candles
if len(fetched_candles) < max_size or (max_size == 0 and len(fetched_candles) == total_candles_count):
# fetched everything
break
offset += len(fetched_candles)
if max_size == 0:
max_size = offset
request_count += 1

if request_count == max_requests_count:
commons_logging.get_logger(self.__class__.__name__).info(
f"OHLCV fetch error: too many requests ({request_count}), fetched: {len(total_candles)} candles"
)
return self._format_ohlcvs(total_candles)

def _format_ohlcvs(self, ohlcvs: list):
# uses PriceIndexes order
# IND_PRICE_TIME = 0
# IND_PRICE_OPEN = 1
# IND_PRICE_HIGH = 2
# IND_PRICE_LOW = 3
# IND_PRICE_CLOSE = 4
# IND_PRICE_VOL = 5
return [
[
int(self.get_parsed_time(ohlcv["timestamp"]).timestamp()),
ohlcv["open"],
ohlcv["high"],
ohlcv["low"],
ohlcv["close"],
ohlcv["volume"],
]
for ohlcv in ohlcvs
]

async def get_asset_id(self, bucket_id: str, asset_name: str) -> str:
"""
Not implemented for authenticated users
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Drakkar-Software requirements
OctoBot-Commons==1.9.28
OctoBot-Trading==2.4.35
OctoBot-Trading==2.4.36
OctoBot-Evaluators==1.9.1
OctoBot-Tentacles-Manager==2.9.5
OctoBot-Services==1.6.4
Expand Down