From 5c6ea177ddc3e1c1d15f2d1e021773b902a24516 Mon Sep 17 00:00:00 2001 From: codez0mb1e Date: Tue, 18 Oct 2022 15:55:03 +0000 Subject: [PATCH] Minor changes --- src/azure.py | 2 +- src/bitfinex_crypto_parser.py | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/azure.py b/src/azure.py index e962acd..cdfcf77 100644 --- a/src/azure.py +++ b/src/azure.py @@ -54,7 +54,7 @@ class AzureDbConnection: con=self._db, schema='dbo', name=target_table, - if_exists='replace', # or append + if_exists='append', # or replace index=False, chunksize=chunksize, dtype=db_mapping diff --git a/src/bitfinex_crypto_parser.py b/src/bitfinex_crypto_parser.py index 2084877..86c9f61 100644 --- a/src/bitfinex_crypto_parser.py +++ b/src/bitfinex_crypto_parser.py @@ -21,7 +21,7 @@ from azure import AzureDbConnection, ConnectionSettings #> kaggle datasets download tencars/392-crypto-currency-pairs-at-minute-resolution #> unzip 392-crypto-currency-pairs-at-minute-resolution.zip -input_dir = "../data" +input_dir: str = "../data" # Get names and number of available currency pairs pair_names = [x[:-4] for x in os.listdir(input_dir)] @@ -79,10 +79,10 @@ ethusd_1h.tail() # %% ---- conn_settings = ConnectionSettings( - 'datainstinct', - 'market-data-db', - 'demo', - '0test_test_AND_test' + '', + '', + '', + '****' ) db_conn = AzureDbConnection(conn_settings) @@ -112,6 +112,7 @@ pd.options.mode.chained_assignment = None min_candels_n = 10000 +i = 1 for pair in usd_pairs: print(f'INFO | {pair} > Starting read dataset...') @@ -119,7 +120,7 @@ for pair in usd_pairs: if len(candles_df) > min_candels_n: - df = candles_df.loc['2022-07-01':'2022-10-01'] + df = candles_df.loc[:'2022-10-01'] if len(df) > 0: df = calc_ohlcv_1h(df) @@ -131,10 +132,10 @@ for pair in usd_pairs: df['interval'] = '1H' df.drop(columns='hour', inplace=True) - print(f'INFO | {pair} > Starting insert to DB...') + print(f'INFO | {pair} > Starting insert to DB ({i} of {len(usd_pairs)})...') print('DEBUG | {} rows from {} to {}'.format(df.shape[0], min(df['time']), max(df['time']))) try: - db_conn.insert(df, 'crypto', db_mapping) + db_conn.insert(df, 'crypto_1h', db_mapping) except Exception as ex: print(f'ERROR | {pair} > {ex}') @@ -142,6 +143,7 @@ for pair in usd_pairs: print(f'WARN | {pair} > No new records') else: print(f'WARN | {pair} > Only {candles_df.shape[0]} records') + i += 1 # %%