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

Fix endlesslop in case of empty response #2

Merged
merged 17 commits into from
Oct 22, 2019
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
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
max-line-length = 160
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- repo: https://gitlab.com/pycqa/flake8
rev: '' # pick a git hash / tag to point to
hooks:
- id: flake8
19 changes: 16 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@ Black Oak requires Python 3.7 or higher.
pip install -r requirements.txt
```

### Setup Development Environment
#### Prerequisites
- [Direnv](https://direnv.net/)
- `brew install direnv`
- [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
- `brew cask install miniconda`

#### Installation
The .envrc takes care of installing the conda environment, dependencies and pre-commit
```bash
direnv allow
```

#### Run Black Oak
```bash
./bin/run_ohlcv_data_fetcher.sh config.toml
Expand Down Expand Up @@ -65,16 +78,16 @@ ratelimit = false
[exchanges]

[exchanges.bitfinex]
filter_symbols = [] # passing an empty list will pull all available symbols!!!
filter_resolutions = [] # passing an empty list will pull all available resolutions
filter_symbols = [] # passing an empty list will pull all available symbols!!!
filter_resolutions = [] # passing an empty list will pull all available resolutions
since = "2017-01-01 00:00:00"
until = "2019-06-26 00:00:00"
limit = 5000

[exchanges.bitmex]
filter_symbols = ["BTC/USD", "ETH/USD"]
filter_resolutions = ["1m", "1h", "1d"]
since = "2017-01-01 00:00:00"
since = "" # leave since empty to fetch data from the first date available
until = "2019-06-26 00:00:00"
limit = 750
```
Expand Down
6 changes: 3 additions & 3 deletions config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[settings]

debug = true
debug = false

# we only implemented file as a backend for now
persistence = "file"
Expand Down Expand Up @@ -37,7 +37,7 @@ default_limit = 200
# filter_resolutions = ["1d"]
# since = "2017-01-01 00:00:00"
# until = "2019-06-26 00:00:00"
# limit = 750
# limit = 1000

# [exchanges.okex3]
# filter_symbols = ["BTC/USDT"]
Expand All @@ -51,7 +51,7 @@ default_limit = 200
# filter_resolutions = []
# since = "2019-07-18 00:00:00"
# until = "2019-08-18 00:00:00"
# limit = 750
# limit = 1000

# [exchanges.kraken]
# filter_symbols = [
Expand Down
44 changes: 44 additions & 0 deletions ohlcv/generate_bitmex_futures_symbols.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# A simple

import datetime

# available future symbols
futures = {
'ADA': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 17},
'BCH': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 17},
'EOS': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 17},
'ETH': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 16},
'LTC': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 19},
'TRX': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 17},
'XBT': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 15},
'XRP': {'timeframes': ['1m', '5m', '1h', '1d'], 'since_year': 17},
}

# F = January
# G = February
# H = March
# J = April
# K = May
# M = June
# N = July
# Q = August
# U = September
# V = October
# X = November
# Z = December
month_codes = ['F', 'G', 'H', 'J', 'K', 'M', 'N', 'Q', 'U', 'V', 'X', 'Z']

if __name__ == '__main__':
for symbol, futures_config in futures.items():

# current year as two digits
current_year = int(datetime.datetime.now().strftime('%y'))
start_year = futures_config['since_year']

while start_year <= current_year:

for month in month_codes:
print(f'https://www.bitmex.com/api/v1/trade/bucketed?symbol={symbol}{month}{start_year}&binSize=1d')

# set iteration to next year
start_year = start_year + 1
19 changes: 11 additions & 8 deletions ohlcv/lib/data_fetcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,15 @@ async def fetch_ohlvc_data(
exchange.headers = {'Connection': 'close'}

# exit the loop if we fetched the whole time series
if since > until and until is not 0:
if since and since > until and until:
break

try:
date = datetime.utcfromtimestamp(
util.ms_timestamp_to_epoch_timestamp(since)) if since else 'no start date given'
logging.info(
'Start fetching %s data points from %s for %s and timestamp %s (%s)',
limit,
exchange.id,
symbol,
since,
datetime.utcfromtimestamp(util.ms_timestamp_to_epoch_timestamp(since))
f'Start fetching {limit} data points from {exchange.id} for {symbol}'
f'and timestamp {since} ({date})'
)

ohlcv_ts = pd.DataFrame(
Expand All @@ -211,11 +209,16 @@ async def fetch_ohlvc_data(
ccxt.DDoSProtection
) as error:
logging.error(
f'Got an error {type(error).__name__} {error.args}. Will try to send the same Request again.',
f'Got an error {type(error).__name__} {error.args}. Will try to send the same Request again.'
)
# skip current iteration and try again if we run into an exception
continue

# exit the loop in case we didn't receive any data for the current configuration
if len(ohlcv_ts) == 0:
logging.info(f'Didn\'t receive any data for {symbol}_{resolution} from {exchange.id}.')
break

# write data frame to csv
io.write_csv(
f'data/{file_name}',
Expand Down