From ddf0c14cec836fd8408e9e5821517890cb42de55 Mon Sep 17 00:00:00 2001 From: itsdeka Date: Mon, 13 Dec 2021 13:15:56 +0100 Subject: [PATCH 1/3] Adjusted get_trades() to allow symbol to be None and get trades for all symbols --- CHANGELOG | 3 +++ bfxapi/examples/rest/get_authenticated_data.py | 2 +- bfxapi/rest/bfx_rest.py | 4 ++-- bfxapi/version.py | 2 +- setup.py | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f972440..351bdaa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +1.3.0 +-) Adjusted get_trades() to allow symbol to be None and get trades for all symbols + 1.2.8 -) Bugfix - It is possible to call bfx.ws.run() from an already running event loop diff --git a/bfxapi/examples/rest/get_authenticated_data.py b/bfxapi/examples/rest/get_authenticated_data.py index 9cf2adc..0efd74f 100644 --- a/bfxapi/examples/rest/get_authenticated_data.py +++ b/bfxapi/examples/rest/get_authenticated_data.py @@ -39,7 +39,7 @@ async def log_active_positions(): [ print (p) for p in positions ] async def log_trades(): - trades = await bfx.rest.get_trades('tBTCUSD', 0, then) + trades = await bfx.rest.get_trades(symbol='tBTCUSD', start=0, end=then) print ("Trades:") [ print (t) for t in trades] diff --git a/bfxapi/rest/bfx_rest.py b/bfxapi/rest/bfx_rest.py index e305666..81fff4a 100644 --- a/bfxapi/rest/bfx_rest.py +++ b/bfxapi/rest/bfx_rest.py @@ -465,7 +465,7 @@ class BfxRest: raw_trades = await self.post(endpoint) return [Trade.from_raw_rest_trade(rt) for rt in raw_trades] - async def get_trades(self, symbol, start, end, limit=25): + async def get_trades(self, start, end, symbol=None, limit=25): """ Get all of the trades between the start and end period associated with API_KEY - Requires authentication. @@ -477,7 +477,7 @@ class BfxRest: @param limit int: max number of items in response @return Array """ - endpoint = "auth/r/trades/{}/hist".format(symbol) + endpoint = "auth/r/trades/{}/hist".format(symbol) if symbol else "auth/r/trades/hist" params = "?start={}&end={}&limit={}".format(start, end, limit) raw_trades = await self.post(endpoint, params=params) return [Trade.from_raw_rest_trade(rt) for rt in raw_trades] diff --git a/bfxapi/version.py b/bfxapi/version.py index e9e4434..e4840b6 100644 --- a/bfxapi/version.py +++ b/bfxapi/version.py @@ -2,4 +2,4 @@ This module contains the current version of the bfxapi lib """ -__version__ = '1.2.8' +__version__ = '1.3.0' diff --git a/setup.py b/setup.py index ffda49f..a5227e7 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from os import path here = path.abspath(path.dirname(__file__)) setup( name='bitfinex-api-py', - version='1.2.8', + version='1.3.0', description='Official Bitfinex Python API', long_description='A Python reference implementation of the Bitfinex API for both REST and websocket interaction', long_description_content_type='text/markdown', From 65a3bec654795025fd1e755106eef75273d695c4 Mon Sep 17 00:00:00 2001 From: itsdeka Date: Tue, 14 Dec 2021 12:05:46 +0100 Subject: [PATCH 2/3] spacing --- CHANGELOG | 3 +++ bfxapi/version.py | 2 +- bfxapi/websockets/generic_websocket.py | 5 ++++- setup.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 351bdaa..748b42a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +1.3.1 +-) Handle exception of asyncio.get_event_loop() | Related to v1.2.8 + 1.3.0 -) Adjusted get_trades() to allow symbol to be None and get trades for all symbols diff --git a/bfxapi/version.py b/bfxapi/version.py index e4840b6..880ed5d 100644 --- a/bfxapi/version.py +++ b/bfxapi/version.py @@ -2,4 +2,4 @@ This module contains the current version of the bfxapi lib """ -__version__ = '1.3.0' +__version__ = '1.3.1' diff --git a/bfxapi/websockets/generic_websocket.py b/bfxapi/websockets/generic_websocket.py index dcb39a8..d615754 100644 --- a/bfxapi/websockets/generic_websocket.py +++ b/bfxapi/websockets/generic_websocket.py @@ -84,7 +84,10 @@ class GenericWebsocket: thread and connection. """ self._start_new_socket() - event_loop = asyncio.get_event_loop() + try: + event_loop = asyncio.get_event_loop() + except Exception: + event_loop = None if not event_loop or not event_loop.is_running(): while True: time.sleep(1) diff --git a/setup.py b/setup.py index a5227e7..2098d8e 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from os import path here = path.abspath(path.dirname(__file__)) setup( name='bitfinex-api-py', - version='1.3.0', + version='1.3.1', description='Official Bitfinex Python API', long_description='A Python reference implementation of the Bitfinex API for both REST and websocket interaction', long_description_content_type='text/markdown', From 0a6cc34f8ae602be9469e2571a2c4de1381152a9 Mon Sep 17 00:00:00 2001 From: itsdeka Date: Tue, 14 Dec 2021 12:10:45 +0100 Subject: [PATCH 3/3] Revert "spacing" This reverts commit 65a3bec654795025fd1e755106eef75273d695c4. --- CHANGELOG | 3 --- bfxapi/version.py | 2 +- bfxapi/websockets/generic_websocket.py | 5 +---- setup.py | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 748b42a..351bdaa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,3 @@ -1.3.1 --) Handle exception of asyncio.get_event_loop() | Related to v1.2.8 - 1.3.0 -) Adjusted get_trades() to allow symbol to be None and get trades for all symbols diff --git a/bfxapi/version.py b/bfxapi/version.py index 880ed5d..e4840b6 100644 --- a/bfxapi/version.py +++ b/bfxapi/version.py @@ -2,4 +2,4 @@ This module contains the current version of the bfxapi lib """ -__version__ = '1.3.1' +__version__ = '1.3.0' diff --git a/bfxapi/websockets/generic_websocket.py b/bfxapi/websockets/generic_websocket.py index d615754..dcb39a8 100644 --- a/bfxapi/websockets/generic_websocket.py +++ b/bfxapi/websockets/generic_websocket.py @@ -84,10 +84,7 @@ class GenericWebsocket: thread and connection. """ self._start_new_socket() - try: - event_loop = asyncio.get_event_loop() - except Exception: - event_loop = None + event_loop = asyncio.get_event_loop() if not event_loop or not event_loop.is_running(): while True: time.sleep(1) diff --git a/setup.py b/setup.py index 2098d8e..a5227e7 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from os import path here = path.abspath(path.dirname(__file__)) setup( name='bitfinex-api-py', - version='1.3.1', + version='1.3.0', description='Official Bitfinex Python API', long_description='A Python reference implementation of the Bitfinex API for both REST and websocket interaction', long_description_content_type='text/markdown',