python-okx 0.2.9__tar.gz → 0.3.1__tar.gz

{python-okx-0.2.9 → python-okx-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-okx
-Version: 0.2.9
+Version: 0.3.1
 Summary: Python SDK for OKX
 Home-page: https://okx.com/docs-v5/
 Author: okxv5api

{python-okx-0.2.9 → python-okx-0.3.1}/okx/Account.py

@@ -49,9 +49,9 @@ class AccountAPI(OkxClient):
 
     # Get Bills Details (recent 3 months)
     def get_account_bills_archive(self, instType='', ccy='', mgnMode='', ctType='', type='', subType='', after='', before='',
-                          limit=''):
+                          limit='',begin='',end=''):
         params = {'instType': instType, 'ccy': ccy, 'mgnMode': mgnMode, 'ctType': ctType, 'type': type,
-                  'subType': subType, 'after': after, 'before': before, 'limit': limit}
+                  'subType': subType, 'after': after, 'before': before, 'limit': limit,'begin':begin,'end':end}
         return self._request_with_params(GET, BILLS_ARCHIVE, params)
 
     # Get Account Configuration
@@ -88,6 +88,10 @@ class AccountAPI(OkxClient):
     def get_leverage(self, instId, mgnMode):
         params = {'instId': instId, 'mgnMode': mgnMode}
         return self._request_with_params(GET, GET_LEVERAGE, params)
+    # Get instruments
+    def get_instruments(self, instType='', ugly = '',instFamily='',instId=''):
+        params = {'instType': instType, 'ugly': ugly, 'instFamily': instFamily, 'instId': instId}
+        return self._request_with_params(GET,GET_INSTRUMENTS,params)
 
     # Get the maximum loan of isolated MARGIN
     def get_max_loan(self, instId, mgnMode, mgnCcy):

{python-okx-0.2.9 → python-okx-0.3.1}/okx/Trade.py

@@ -1,7 +1,5 @@
-import json
-
-from .okxclient import OkxClient
 from .consts import *
+from .okxclient import OkxClient
 
 
 class TradeAPI(OkxClient):
@@ -86,9 +84,10 @@ class TradeAPI(OkxClient):
         return self._request_with_params(GET, ORDERS_HISTORY_ARCHIVE, params)
 
     # Get Transaction Details
-    def get_fills(self, instType='', uly='', instId='', ordId='', after='', before='', limit='', instFamily=''):
+    def get_fills(self, instType='', uly='', instId='', ordId='', after='', before='', limit='', instFamily='',
+                  begin='', end=''):
         params = {'instType': instType, 'uly': uly, 'instId': instId, 'ordId': ordId, 'after': after, 'before': before,
-                  'limit': limit, 'instFamily': instFamily}
+                  'limit': limit, 'instFamily': instFamily, 'begin': begin, 'end': end}
         return self._request_with_params(GET, ORDER_FILLS, params)
 
     # Place Algo Order
@@ -191,3 +190,7 @@ class TradeAPI(OkxClient):
                   'newSlTriggerPx': newSlTriggerPx, 'newSlOrdPx': newSlOrdPx,
                   'newTpTriggerPxType': newTpTriggerPxType, 'newSlTriggerPxType': newSlTriggerPxType}
         return self._request_with_params(POST, AMEND_ALGO_ORDER, params)
+
+    def cancel_all_after(self, timeOut='', tag=''):
+        params = {'timeOut': timeOut, 'tag': tag}
+        return self._request_with_params(POST, CANCEL_ALL_AFTER, params)

python-okx-0.3.1/okx/TradingData.py

@@ -0,0 +1,113 @@
+from .consts import *
+from .okxclient import OkxClient
+
+
+class TradingDataAPI(OkxClient):
+
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1',
+                 domain='https://www.okx.com', debug=True, proxy=None):
+        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
+
+    def get_support_coin(self):
+        return self._request_without_params(GET, SUPPORT_COIN)
+
+    def get_taker_volume(self, ccy, instType, begin='', end='', period=''):
+        params = {'ccy': ccy, 'instType': instType, 'begin': begin, 'end': end, 'period': period}
+        return self._request_with_params(GET, TAKER_VOLUME, params)
+
+    def get_margin_lending_ratio(self, ccy, begin='', end='', period=''):
+        params = {'ccy': ccy, 'begin': begin, 'end': end, 'period': period}
+        return self._request_with_params(GET, MARGIN_LENDING_RATIO, params)
+
+    def get_long_short_ratio(self, ccy, begin='', end='', period=''):
+        params = {'ccy': ccy, 'begin': begin, 'end': end, 'period': period}
+        return self._request_with_params(GET, LONG_SHORT_RATIO, params)
+
+    def get_contracts_interest_volume(self, ccy, begin='', end='', period=''):
+        params = {'ccy': ccy, 'begin': begin, 'end': end, 'period': period}
+        return self._request_with_params(GET, CONTRACTS_INTEREST_VOLUME, params)
+
+    def get_options_interest_volume(self, ccy, period=''):
+        params = {'ccy': ccy, 'period': period}
+        return self._request_with_params(GET, OPTIONS_INTEREST_VOLUME, params)
+
+    def get_put_call_ratio(self, ccy, period=''):
+        params = {'ccy': ccy, 'period': period}
+        return self._request_with_params(GET, PUT_CALL_RATIO, params)
+
+    def get_interest_volume_expiry(self, ccy, period=''):
+        params = {'ccy': ccy, 'period': period}
+        return self._request_with_params(GET, OPEN_INTEREST_VOLUME_EXPIRY, params)
+
+    def get_interest_volume_strike(self, ccy, expTime, period=''):
+        params = {'ccy': ccy, 'expTime': expTime, 'period': period}
+        return self._request_with_params(GET, INTEREST_VOLUME_STRIKE, params)
+
+    def get_taker_block_volume(self, ccy, period=''):
+        params = {'ccy': ccy, 'period': period}
+        return self._request_with_params(GET, TAKER_FLOW, params)
+
+    def get_open_interest_history(self, instId='', period=None, end=None, begin=None, limit=None):
+        params = {'instId': instId}
+        if period is not None:
+            params['period'] = period
+        if end is not None:
+            params['end'] = end
+        if begin is not None:
+            params['begin'] = begin
+        if limit is not None:
+            params['limit'] = limit
+        return self._request_with_params(GET, OPEN_INTEREST_HISTORY, params)
+
+    def get_top_trader_long_short_account_ratio(self, instId='', period=None, end=None, begin=None,
+                                                limit=None):
+        params = {'instId': instId}
+        if period is not None:
+            params['period'] = period
+        if end is not None:
+            params['end'] = end
+        if begin is not None:
+            params['begin'] = begin
+        if limit is not None:
+            params['limit'] = limit
+        return self._request_with_params(GET, LONG_SHORT_ACCOUNT_RATIO_CONTRACT_TOP_TRADER, params)
+
+    def get_top_trader_long_short_position_ratio(self, instId='', period=None, end=None, begin=None,
+                                                 limit=None):
+        params = {'instId': instId}
+        if period is not None:
+            params['period'] = period
+        if end is not None:
+            params['end'] = end
+        if begin is not None:
+            params['begin'] = begin
+        if limit is not None:
+            params['limit'] = limit
+        return self._request_with_params(GET, LONG_SHORT_POSITION_RATIO_CONTRACT_TOP_TRADER, params)
+
+    def get_contract_long_short_ratio(self, instId='', period=None, end=None, begin=None,
+                                      limit=None):
+        params = {'instId': instId}
+        if period is not None:
+            params['period'] = period
+        if end is not None:
+            params['end'] = end
+        if begin is not None:
+            params['begin'] = begin
+        if limit is not None:
+            params['limit'] = limit
+        return self._request_with_params(GET, LONG_SHORT_ACCOUNT_RATIO_CONTRACT, params)
+
+    def get_contract_taker_volume(self, instId='', period=None, unit=None, end=None, begin=None, limit=None):
+        params = {'instId': instId}
+        if period is not None:
+            params['period'] = period
+        if end is not None:
+            params['end'] = end
+        if begin is not None:
+            params['begin'] = begin
+        if limit is not None:
+            params['limit'] = limit
+        if unit is not None:
+            params['unit'] = unit
+        return self._request_with_params(GET, TAKER_VOLUME_CONTRACT, params)

{python-okx-0.2.9 → python-okx-0.3.1}/okx/__init__.py

@@ -2,4 +2,4 @@
 Python SDK for the OKX API v5
 
 """
-__version__="0.2.9"
+__version__="0.3.1"

{python-okx-0.2.9 → python-okx-0.3.1}/okx/consts.py

@@ -54,6 +54,7 @@ SET_RISK_OFFSET_TYPE = '/api/v5/account/set-riskOffset-type'
 SET_AUTO_LOAN = '/api/v5/account/set-auto-loan'
 ACTIVSTE_OPTION = '/api/v5/account/activate-option'
 POSITION_BUILDER = '/api/v5/account/position-builder'
+GET_INSTRUMENTS = '/api/v5/account/instruments'
 
 # funding-complete-testcomplete
 NON_TRADABLE_ASSETS = '/api/v5/asset/non-tradable-assets'
@@ -136,6 +137,12 @@ PUT_CALL_RATIO = '/api/v5/rubik/stat/option/open-interest-volume-ratio'
 OPEN_INTEREST_VOLUME_EXPIRY = '/api/v5/rubik/stat/option/open-interest-volume-expiry'
 INTEREST_VOLUME_STRIKE = '/api/v5/rubik/stat/option/open-interest-volume-strike'
 TAKER_FLOW = '/api/v5/rubik/stat/option/taker-block-volume'
+OPEN_INTEREST_HISTORY = '/api/v5/rubik/stat/contracts/open-interest-history'
+LONG_SHORT_ACCOUNT_RATIO_CONTRACT_TOP_TRADER = '/api/v5/rubik/stat/contracts/long-short-account-ratio-contract-top-trader'
+LONG_SHORT_POSITION_RATIO_CONTRACT_TOP_TRADER = '/api/v5/rubik/stat/contracts/long-short-position-ratio-contract-top-trader'
+LONG_SHORT_ACCOUNT_RATIO_CONTRACT = '/api/v5/rubik/stat/contracts/long-short-account-ratio-contract'
+TAKER_VOLUME_CONTRACT = '/api/v5/rubik/stat/taker-volume-contract'
+
 
 # TRADE-Complete
 PLACR_ORDER = '/api/v5/trade/order'
@@ -165,7 +172,7 @@ CONVERT_EASY_HISTORY = '/api/v5/trade/easy-convert-history'
 ONE_CLICK_REPAY_SUPPORT = '/api/v5/trade/one-click-repay-currency-list'
 ONE_CLICK_REPAY = '/api/v5/trade/one-click-repay'
 ONE_CLICK_REPAY_HISTORY = '/api/v5/trade/one-click-repay-history'
-
+CANCEL_ALL_AFTER = '/api/v5/trade/cancel-all-after'
 
 # SubAccount-complete-testwriteComplete
 BALANCE = '/api/v5/account/subaccount/balances'

{python-okx-0.2.9 → python-okx-0.3.1}/python_okx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-okx
-Version: 0.2.9
+Version: 0.3.1
 Summary: Python SDK for OKX
 Home-page: https://okx.com/docs-v5/
 Author: okxv5api

python-okx-0.2.9/okx/TradingData.py

@@ -1,55 +0,0 @@
-from .okxclient import OkxClient
-from .consts import *
-
-
-class TradingDataAPI(OkxClient):
-
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
-        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
-
-
-    def get_support_coin(self):
-        return self._request_without_params(GET, SUPPORT_COIN)
-
-    def get_taker_volume(self, ccy, instType, begin='', end='', period=''):
-        params = {'ccy': ccy, 'instType': instType, 'begin': begin, 'end': end, 'period': period}
-        return self._request_with_params(GET, TAKER_VOLUME, params)
-
-    def get_margin_lending_ratio(self, ccy, begin='', end='', period=''):
-        params = {'ccy': ccy, 'begin': begin, 'end': end, 'period': period}
-        return self._request_with_params(GET, MARGIN_LENDING_RATIO, params)
-
-    def get_long_short_ratio(self, ccy, begin='', end='', period=''):
-        params = {'ccy': ccy, 'begin': begin, 'end': end, 'period': period}
-        return self._request_with_params(GET, LONG_SHORT_RATIO, params)
-
-    def get_contracts_interest_volume(self, ccy, begin='', end='', period=''):
-        params = {'ccy': ccy, 'begin': begin, 'end': end, 'period': period}
-        return self._request_with_params(GET, CONTRACTS_INTEREST_VOLUME, params)
-
-    def get_options_interest_volume(self, ccy, period=''):
-        params = {'ccy': ccy, 'period': period}
-        return self._request_with_params(GET, OPTIONS_INTEREST_VOLUME, params)
-
-    def get_put_call_ratio(self, ccy, period=''):
-        params = {'ccy': ccy, 'period': period}
-        return self._request_with_params(GET, PUT_CALL_RATIO, params)
-
-    def get_interest_volume_expiry(self, ccy, period=''):
-        params = {'ccy': ccy, 'period': period}
-        return self._request_with_params(GET, OPEN_INTEREST_VOLUME_EXPIRY, params)
-
-    def get_interest_volume_strike(self, ccy, expTime, period=''):
-        params = {'ccy': ccy, 'expTime': expTime, 'period': period}
-        return self._request_with_params(GET, INTEREST_VOLUME_STRIKE, params)
-
-    def get_taker_block_volume(self, ccy, period=''):
-        params = {'ccy': ccy, 'period': period}
-        return self._request_with_params(GET, TAKER_FLOW, params)
-
-
-
-
-
-
-