python-okx 0.2.8__tar.gz → 0.3.0__tar.gz

{python-okx-0.2.8 → python-okx-0.3.0}/PKG-INFO

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

{python-okx-0.2.8 → python-okx-0.3.0}/okx/Account.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class AccountAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True,proxy = None):
+    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)
 
     # Get Positions
@@ -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.8 → python-okx-0.3.0}/okx/BlockTrading.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class BlockTradingAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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 counterparties(self):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/Convert.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class ConvertAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True,proxy = None):
+    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_currencies(self):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/Earning.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class EarningAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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_offers(self,productId = '',protocolType = '',ccy = ''):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/FDBroker.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class FDBrokerAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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 generate_rebate_details_download_link(self, begin ='', end = ''):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/Funding.py

@@ -5,9 +5,14 @@ from .consts import *
 class FundingAPI(OkxClient):
 
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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)
 
+    # Get Non Tradable Assets
+    def get_non_tradable_assets(self, ccy: str = ''):
+        params = {'ccy': ccy}
+        return self._request_with_params(GET, NON_TRADABLE_ASSETS, params)
+
     # Get Deposit Address
     def get_deposit_address(self, ccy):
         params = {'ccy': ccy}
@@ -39,12 +44,12 @@ class FundingAPI(OkxClient):
     def get_deposit_history(self, ccy='', state='', after='', before='', limit='', txId='', depId='', fromWdId=''):
         params = {'ccy': ccy, 'state': state, 'after': after, 'before': before, 'limit': limit, 'txId': txId,
                   'depId': depId, 'fromWdId': fromWdId}
-        return self._request_with_params(GET, DEPOSIT_HISTORIY, params)
+        return self._request_with_params(GET, DEPOSIT_HISTORY, params)
 
     # Get Withdrawal History
     def get_withdrawal_history(self, ccy='', wdId='', state='', after='', before='', limit='',txId=''):
         params = {'ccy': ccy, 'wdId': wdId, 'state': state, 'after': after, 'before': before, 'limit': limit,'txId':txId}
-        return self._request_with_params(GET, WITHDRAWAL_HISTORIY, params)
+        return self._request_with_params(GET, WITHDRAWAL_HISTORY, params)
 
     # Get Currencies
     def get_currencies(self, ccy=''):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/Grid.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class GridAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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 grid_order_algo(self, instId='', algoOrdType='', maxPx='', minPx='', gridNum='', runType='', tpTriggerPx='',

{python-okx-0.2.8 → python-okx-0.3.0}/okx/MarketData.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class MarketAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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)
 
 

{python-okx-0.2.8 → python-okx-0.3.0}/okx/NDBroker.py

@@ -1,7 +1,7 @@
 from .okxclient import OkxClient
 from .consts import *
 class NDBrokerAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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)
 
     #GET /api/v5/broker/nd/info

{python-okx-0.2.8 → python-okx-0.3.0}/okx/PublicData.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class PublicAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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)
 
     # Get Instruments

{python-okx-0.2.8 → python-okx-0.3.0}/okx/SpreadTrading.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class SpreadTradingAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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)
 
     # Place Order

{python-okx-0.2.8 → python-okx-0.3.0}/okx/Status.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class StatusAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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 status(self, state=''):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/SubAccount.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class SubAccountAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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_account_balance(self, subAcct):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/Trade.py

@@ -6,7 +6,7 @@ from .consts import *
 
 class TradeAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1',
+    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)
 
@@ -40,7 +40,7 @@ class TradeAPI(OkxClient):
     def amend_order(self, instId, cxlOnFail='', ordId='', clOrdId='', reqId='', newSz='', newPx='', newTpTriggerPx='',
                     newTpOrdPx='', newSlTriggerPx='', newSlOrdPx='', newTpTriggerPxType='', newSlTriggerPxType='',
                     attachAlgoOrds=''):
-        params = {'instId': instId, 'cxlOnFailc': cxlOnFail, 'ordId': ordId, 'clOrdId': clOrdId, 'reqId': reqId,
+        params = {'instId': instId, 'cxlOnFail': cxlOnFail, 'ordId': ordId, 'clOrdId': clOrdId, 'reqId': reqId,
                   'newSz': newSz, 'newPx': newPx, 'newTpTriggerPx': newTpTriggerPx, 'newTpOrdPx': newTpOrdPx,
                   'newSlTriggerPx': newSlTriggerPx, 'newSlOrdPx': newSlOrdPx, 'newTpTriggerPxType': newTpTriggerPxType,
                   'newSlTriggerPxType': newSlTriggerPxType}
@@ -86,9 +86,9 @@ 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
@@ -124,7 +124,7 @@ class TradeAPI(OkxClient):
                          algoClOrdId=''):
         params = {'ordType': ordType, 'algoId': algoId, 'instType': instType, 'instId': instId, 'after': after,
                   'before': before, 'limit': limit, 'algoClOrdId': algoClOrdId}
-        return self._request_with_params(GET, ORDERS_ALGO_OENDING, params)
+        return self._request_with_params(GET, ORDERS_ALGO_PENDING, params)
 
     # Get Algo Order History
     def order_algos_history(self, ordType, state='', algoId='', instType='', instId='', after='', before='', limit=''):

{python-okx-0.2.8 → python-okx-0.3.0}/okx/TradingData.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class TradingDataAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    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)
 
 

{python-okx-0.2.8 → python-okx-0.3.0}/okx/__init__.py

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

{python-okx-0.2.8 → python-okx-0.3.0}/okx/consts.py

@@ -54,21 +54,23 @@ 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'
 DEPOSIT_ADDRESS = '/api/v5/asset/deposit-address'
 GET_BALANCES = '/api/v5/asset/balances'
 FUNDS_TRANSFER = '/api/v5/asset/transfer'
 TRANSFER_STATE = '/api/v5/asset/transfer-state'
 WITHDRAWAL_COIN = '/api/v5/asset/withdrawal'
-DEPOSIT_HISTORIY = '/api/v5/asset/deposit-history'
+DEPOSIT_HISTORY = '/api/v5/asset/deposit-history'
 CURRENCY_INFO = '/api/v5/asset/currencies'
 PURCHASE_REDEMPT = '/api/v5/asset/purchase_redempt'
 BILLS_INFO = '/api/v5/asset/bills'
 DEPOSIT_LIGHTNING = '/api/v5/asset/deposit-lightning'
 WITHDRAWAL_LIGHTNING = '/api/v5/asset/withdrawal-lightning'
 CANCEL_WITHDRAWAL = '/api/v5/asset/cancel-withdrawal' #need add
-WITHDRAWAL_HISTORIY = '/api/v5/asset/withdrawal-history'
+WITHDRAWAL_HISTORY = '/api/v5/asset/withdrawal-history'
 CONVERT_DUST_ASSETS = '/api/v5/asset/convert-dust-assets' #need add
 ASSET_VALUATION = '/api/v5/asset/asset-valuation' #need add
 SET_LENDING_RATE = '/api/v5/asset/set-lending-rate'
@@ -153,7 +155,7 @@ ORDERS_FILLS_HISTORY = '/api/v5/trade/fills-history'
 PLACE_ALGO_ORDER = '/api/v5/trade/order-algo'
 CANCEL_ALGOS = '/api/v5/trade/cancel-algos'
 Cancel_Advance_Algos = '/api/v5/trade/cancel-advance-algos'
-ORDERS_ALGO_OENDING = '/api/v5/trade/orders-algo-pending'
+ORDERS_ALGO_PENDING = '/api/v5/trade/orders-algo-pending'
 ORDERS_ALGO_HISTORY = '/api/v5/trade/orders-algo-history'
 GET_ALGO_ORDER_DETAILS = '/api/v5/trade/order-algo'
 AMEND_ALGO_ORDER = '/api/v5/trade/amend-algos'

{python-okx-0.2.8 → python-okx-0.3.0}/okx/okxclient.py

@@ -1,22 +1,27 @@
 import json
+import warnings
+from datetime import datetime, timezone
 
 import httpx
 from httpx import Client
+from datetime import datetime, timezone
 
 from . import consts as c, utils, exceptions
 
 
 class OkxClient(Client):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1',base_api=c.API_URL, debug='True', proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1',base_api=c.API_URL, debug='True', proxy=None):
         super().__init__(base_url=base_api, http2=True, proxy=proxy)
         self.API_KEY = api_key
         self.API_SECRET_KEY = api_secret_key
         self.PASSPHRASE = passphrase
-        self.use_server_time = use_server_time
+        self.use_server_time = False
         self.flag = flag
         self.domain = base_api
         self.debug = debug
+        if use_server_time is not None:
+            warnings.warn("use_server_time parameter is deprecated. Please remove it.", DeprecationWarning)
 
     def _request(self, method, request_path, params):
         if method == c.GET:
@@ -50,6 +55,7 @@ class OkxClient(Client):
         request_path = c.API_URL + c.SERVER_TIMESTAMP_URL
         response = self.get(request_path)
         if response.status_code == 200:
-            return response.json()['data'][0]['ts']
+            ts = datetime.fromtimestamp(int(response.json()['data'][0]['ts']) / 1000.0, tz=timezone.utc)
+            return ts.isoformat(timespec='milliseconds').replace('+00:00', 'Z')
         else:
             return ""

{python-okx-0.2.8 → python-okx-0.3.0}/python_okx.egg-info/PKG-INFO

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