Merge pull request #77 from verata-veritatis/fix_spot_get_active_order

Fix spot get active order

Author: dextertd

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.4] - 2021-12-30
+### Added
+- `endpoint` arg to `get_active_order()`
+
+### Fixed
+- A Websocket test case, by raising an exception instead of logging
+
 ## [1.3.3] - 2021-12-24
 - Improve `get_risk_limit()`
   - Fixed: call this endpoint without authentication

pybit/__init__.py

@@ -35,7 +35,7 @@
     from json.decoder import JSONDecodeError
 
 # Versioning.
-VERSION = '1.3.3'
+VERSION = '1.3.4'
 
 
 class HTTP:
@@ -514,24 +514,30 @@ def place_active_order_bulk(self, orders: list, max_in_parallel=10):
         executor.shutdown()
         return [execution.result() for execution in executions]
 
-    def get_active_order(self, **kwargs):
+    def get_active_order(self, endpoint="", **kwargs):
         """
         Gets an active order. For more information, see
         https://bybit-exchange.github.io/docs/inverse/#t-getactive.
 
         :param kwargs: See
             https://bybit-exchange.github.io/docs/inverse/#t-getactive.
+        :param endpoint: The endpoint path, such as "/spot/v1/order".
+            This allows the user to choose between which endpoint to use to
+            fetch a spot order.
         :returns: Request results as dictionary.
         """
 
-        if self.spot is True or kwargs.get('spot', '') is True:
-            suffix = '/spot/v1/history-orders'
-        elif kwargs.get('symbol', '').endswith('USDT'):
-            suffix = '/private/linear/order/list'
-        elif kwargs.get('symbol', '')[-2:].isdigit():
-            suffix = '/futures/private/order/list'
+        if endpoint:
+            suffix = endpoint
         else:
-            suffix = '/v2/private/order/list'
+            if self.spot is True or kwargs.get('spot', '') is True:
+                suffix = '/spot/v1/history-orders'
+            elif kwargs.get('symbol', '').endswith('USDT'):
+                suffix = '/private/linear/order/list'
+            elif kwargs.get('symbol', '')[-2:].isdigit():
+                suffix = '/futures/private/order/list'
+            else:
+                suffix = '/v2/private/order/list'
 
         return self._submit_request(
             method='GET',

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='pybit',
-    version='1.3.3',
+    version='1.3.4',
     description='Python3 Bybit HTTP/WebSocket API Connector', 
     long_description=long_description,
     long_description_content_type='text/markdown',