1.0.2

CHANGELOG.md

@@ -6,6 +6,13 @@ The project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html
 
 ## [Pending release]
 
+## [1.0.2] - 2020-02-04
+
+### Changed
+
+- Bugfix: Fix 'from' and 'to' timestamps in `get_account_orders` and `get_account_trades` REST calls
+- Bugfix: Handle subscription error due to invalid credentials properly
+
 ## [1.0.1] - 2020-02-01
 
 ### Changed
@@ -24,6 +31,7 @@ The project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html
 
 - __Important!!!__ REST response body is not returned as a string anymore but as a dictionary instead. If you did `json.loads(response['response'])` before, now use only `response['response']`.
 
-[Pending release]: https://github.com/nardew/bitpanda-aio/compare/1.0.1...HEAD
-[1.0.0]: https://github.com/nardew/bitpanda-aio/compare/0.1.0...1.0.0
-[1.0.1]: https://github.com/nardew/bitpanda-aio/compare/1.0.0...1.0.1
+[Pending release]: https://github.com/nardew/bitpanda-aio/compare/1.0.2...HEAD
+[1.0.2]: https://github.com/nardew/bitpanda-aio/compare/1.0.1...1.0.2
+[1.0.1]: https://github.com/nardew/bitpanda-aio/compare/1.0.0...1.0.1
+[1.0.0]: https://github.com/nardew/bitpanda-aio/compare/0.1.0...1.0.0

bitpanda/BitpandaClient.py

@@ -42,24 +42,18 @@ async def get_account_orders(self, from_timestamp : datetime.datetime = None, to
 	                             pair : Pair = None, with_cancelled_and_rejected : str = None, with_just_filled_inactive : str = None,
 	                             max_page_size : str = None, cursor : str = None) -> dict:
 		params = BitpandaClient._clean_request_params({
-			"from": from_timestamp,
-			"to": to_timestamp,
 			"instrument_code": pair,
 			"with_cancelled_and_rejected": with_cancelled_and_rejected,
 			"with_just_filled_inactive": with_just_filled_inactive,
 			"max_page_size": max_page_size,
 			"cursor": cursor,
 		})
 
-		try:
-			params["from"] = params["from"].astimezone(pytz.utc).isoformat()
-		except KeyError:
-			pass
+		if from_timestamp is not None:
+			params["from"] = from_timestamp.astimezone(pytz.utc).isoformat()
 
-		try:
-			params["to"] = params["to"].astimezone(pytz.utc).isoformat()
-		except KeyError:
-			pass
+		if to_timestamp is not None:
+			params["to"] = to_timestamp.astimezone(pytz.utc).isoformat()
 
 		return await self._create_get("account/orders", params = params, headers = self._get_header_api_key())
 
@@ -72,22 +66,16 @@ async def get_account_order_trades(self, order_id : str) -> dict:
 	async def get_account_trades(self, from_timestamp : datetime.datetime = None, to_timestamp : datetime.datetime = None,
 	                             pair : Pair = None, max_page_size : str = None, cursor : str = None) -> dict:
 		params = BitpandaClient._clean_request_params({
-			"from": from_timestamp,
-			"to": to_timestamp,
 			"instrument_code": pair,
 			"max_page_size": max_page_size,
 			"cursor": cursor,
 		})
 
-		try:
-			params["from"] = params["from"].astimezone(pytz.utc).isoformat()
-		except KeyError:
-			pass
+		if from_timestamp is not None:
+			params["from"] = from_timestamp.astimezone(pytz.utc).isoformat()
 
-		try:
-			params["to"] = params["to"].astimezone(pytz.utc).isoformat()
-		except KeyError:
-			pass
+		if to_timestamp is not None:
+			params["to"] = to_timestamp.astimezone(pytz.utc).isoformat()
 
 		return await self._create_get("account/trades", params = params, headers = self._get_header_api_key())
 

bitpanda/subscriptions.py

@@ -57,14 +57,14 @@ async def run(self) -> None:
 						response = json.loads(await websocket.recv())
 						LOG.debug(f"< {response}")
 
-						# subscription positive response
-						if response['type'] == "SUBSCRIPTIONS":
-							LOG.info(f"Subscription confirmed for channels [" + ",".join([channel["name"] for channel in response["channels"]]) + "]")
-
 						# subscription negative response
-						elif response['type'] == "ERROR":
+						if "error" in response or response['type'] == "ERROR":
 							raise Exception(f"Subscription error. Request [{json.dumps(subscription_message)}] Response [{json.dumps(response)}]")
 
+						# subscription positive response
+						elif response['type'] == "SUBSCRIPTIONS":
+							LOG.info(f"Subscription confirmed for channels [" + ",".join([channel["name"] for channel in response["channels"]]) + "]")
+
 						# remote termination with an opportunity to reconnect
 						elif response["type"] == "CONNECTION_CLOSING":
 							LOG.warning(f"Server is performing connection termination with an opportunity to reconnect.")

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
 	name="bitpanda-aio",
-	version="1.0.1",
+	version="1.0.2",
 	author="nardew",
 	author_email="[email protected]",
 	description="Bitpanda Global Exchange API asynchronous python client",