python-okx 0.3.9__tar.gz → 0.4.2__tar.gz

python_okx-0.4.2/MANIFEST.in

@@ -0,0 +1,3 @@
+include requirements.txt
+include README.md
+

{python_okx-0.3.9/python_okx.egg-info → python_okx-0.4.2}/PKG-INFO

@@ -1,21 +1,42 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-okx
-Version: 0.3.9
+Version: 0.4.2
 Summary: Python SDK for OKX
 Home-page: https://okx.com/docs-v5/
 Author: okxv5api
 Author-email: api@okg.com
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Requires-Dist: importlib-metadata
-Requires-Dist: httpx[http2]
-Requires-Dist: keyring
-Requires-Dist: loguru
-Requires-Dist: requests
-Requires-Dist: Twisted
-Requires-Dist: pyOpenSSL
+Requires-Dist: httpx[http2]>=0.24.0
+Requires-Dist: requests>=2.25.0
+Requires-Dist: websockets>=10.0
+Requires-Dist: certifi>=2021.0.0
+Requires-Dist: loguru>=0.7.0
+Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: pytest>=7.0.0
+Requires-Dist: pytest-asyncio>=0.21.0
+Requires-Dist: pytest-cov>=4.0.0
+Requires-Dist: ruff>=0.1.0
+Requires-Dist: build>=1.0.0
+Requires-Dist: twine>=4.0.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ### Overview
 This is an unofficial Python wrapper for the [OKX exchange v5 API](https://www.okx.com/okx-api)
@@ -24,8 +45,6 @@ If you came here looking to purchase cryptocurrencies from the OKX exchange, ple
 
 #### Source code
 https://github.com/okxapi/python-okx
-#### OKX API Telegram
-https://t.me/OKXAPI
 #### API trading tutorials
 - Spot trading: https://www.okx.com/help/how-can-i-do-spot-trading-with-the-jupyter-notebook
 - Derivative trading: https://www.okx.com/help/how-can-i-do-derivatives-trading-with-the-jupyter-notebook
@@ -39,22 +58,83 @@ Make sure you update often and check the [Changelog](https://www.okx.com/docs-v5
 - Websocket handling with reconnection and multiplexed connections
 
 ### Quick start
-#### Prerequisites
 
-`python version：>=3.9`
+#### Prerequisites
 
-`WebSocketAPI： websockets package advise version 6.0`
+`python version：>=3.7`
 
-#### Step 1: register an account on OKX and apply for an API key
+#### Step 1: Register an account on OKX and apply for an API key
 - Register for an account: https://www.okx.com/account/register
 - Apply for an API key: https://www.okx.com/account/users/myApi
 
-#### Step 2: install python-okx
+#### Step 2: Install python-okx
 
-```python
+```bash
 pip install python-okx
 ```
 
+### API Credentials
+
+#### Option 1: Hardcoded credentials
+
+```python
+from okx import Account
+
+account = Account.AccountAPI(
+    api_key="your-api-key-here",
+    api_secret_key="your-api-secret-here",
+    passphrase="your-passphrase-here",
+    flag="1",  # 0 = live trading, 1 = demo trading
+    debug=False
+)
+```
+
+#### Option 2: Using `.env` file (recommended)
+
+Create a `.env` file in your project root:
+
+```bash
+OKX_API_KEY=your-api-key-here
+OKX_API_SECRET=your-api-secret-here
+OKX_PASSPHRASE=your-passphrase-here
+OKX_FLAG=1
+```
+
+Then load it in your code:
+
+```python
+import os
+from dotenv import load_dotenv
+from okx import Account
+
+load_dotenv()
+
+account = Account.AccountAPI(
+    api_key=os.getenv('OKX_API_KEY'),
+    api_secret_key=os.getenv('OKX_API_SECRET'),
+    passphrase=os.getenv('OKX_PASSPHRASE'),
+    flag=os.getenv('OKX_FLAG', '1'),
+    debug=False
+)
+```
+
+### Development Setup
+
+For contributors or local development:
+
+```bash
+# Clone the repository
+git clone https://github.com/okxapi/python-okx.git
+cd python-okx
+
+# Install dependencies
+pip install -r requirements.txt
+pip install -e .
+
+# Run tests
+pytest test/unit/ -v
+```
+
 #### Step 3: Run examples
 
 - Fill in API credentials in the corresponding examples

python_okx-0.3.9/PKG-INFO → python_okx-0.4.2/README.md

@@ -1,22 +1,3 @@
-Metadata-Version: 2.1
-Name: python-okx
-Version: 0.3.9
-Summary: Python SDK for OKX
-Home-page: https://okx.com/docs-v5/
-Author: okxv5api
-Author-email: api@okg.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown
-Requires-Dist: importlib-metadata
-Requires-Dist: httpx[http2]
-Requires-Dist: keyring
-Requires-Dist: loguru
-Requires-Dist: requests
-Requires-Dist: Twisted
-Requires-Dist: pyOpenSSL
-
 ### Overview
 This is an unofficial Python wrapper for the [OKX exchange v5 API](https://www.okx.com/okx-api)
 
@@ -24,8 +5,6 @@ If you came here looking to purchase cryptocurrencies from the OKX exchange, ple
 
 #### Source code
 https://github.com/okxapi/python-okx
-#### OKX API Telegram
-https://t.me/OKXAPI
 #### API trading tutorials
 - Spot trading: https://www.okx.com/help/how-can-i-do-spot-trading-with-the-jupyter-notebook
 - Derivative trading: https://www.okx.com/help/how-can-i-do-derivatives-trading-with-the-jupyter-notebook
@@ -39,22 +18,83 @@ Make sure you update often and check the [Changelog](https://www.okx.com/docs-v5
 - Websocket handling with reconnection and multiplexed connections
 
 ### Quick start
-#### Prerequisites
 
-`python version：>=3.9`
+#### Prerequisites
 
-`WebSocketAPI： websockets package advise version 6.0`
+`python version：>=3.7`
 
-#### Step 1: register an account on OKX and apply for an API key
+#### Step 1: Register an account on OKX and apply for an API key
 - Register for an account: https://www.okx.com/account/register
 - Apply for an API key: https://www.okx.com/account/users/myApi
 
-#### Step 2: install python-okx
+#### Step 2: Install python-okx
 
-```python
+```bash
 pip install python-okx
 ```
 
+### API Credentials
+
+#### Option 1: Hardcoded credentials
+
+```python
+from okx import Account
+
+account = Account.AccountAPI(
+    api_key="your-api-key-here",
+    api_secret_key="your-api-secret-here",
+    passphrase="your-passphrase-here",
+    flag="1",  # 0 = live trading, 1 = demo trading
+    debug=False
+)
+```
+
+#### Option 2: Using `.env` file (recommended)
+
+Create a `.env` file in your project root:
+
+```bash
+OKX_API_KEY=your-api-key-here
+OKX_API_SECRET=your-api-secret-here
+OKX_PASSPHRASE=your-passphrase-here
+OKX_FLAG=1
+```
+
+Then load it in your code:
+
+```python
+import os
+from dotenv import load_dotenv
+from okx import Account
+
+load_dotenv()
+
+account = Account.AccountAPI(
+    api_key=os.getenv('OKX_API_KEY'),
+    api_secret_key=os.getenv('OKX_API_SECRET'),
+    passphrase=os.getenv('OKX_PASSPHRASE'),
+    flag=os.getenv('OKX_FLAG', '1'),
+    debug=False
+)
+```
+
+### Development Setup
+
+For contributors or local development:
+
+```bash
+# Clone the repository
+git clone https://github.com/okxapi/python-okx.git
+cd python-okx
+
+# Install dependencies
+pip install -r requirements.txt
+pip install -e .
+
+# Run tests
+pytest test/unit/ -v
+```
+
 #### Step 3: Run examples
 
 - Fill in API credentials in the corresponding examples

{python_okx-0.3.9 → python_okx-0.4.2}/okx/Account.py

@@ -23,32 +23,34 @@ class AccountAPI(OkxClient):
         return self._request_with_params(GET, ACCOUNT_INFO, params)
 
     # Get Positions
-    def get_positions(self, instType='', instId=''):
-        params = {'instType': instType, 'instId': instId}
+    def get_positions(self, instType='', instId='', posId=''):
+        params = {'instType': instType, 'instId': instId, 'posId': posId}
         return self._request_with_params(GET, POSITION_INFO, params)
 
-    def position_builder(self, acctLv=None,inclRealPosAndEq=False, lever=None, greeksType=None, simPos=None,
-                         simAsset=None):
+    def position_builder(self, acctLv=None, inclRealPosAndEq=None, lever=None, greeksType=None, simPos=None,
+                         simAsset=None, idxVol=None):
         params = {}
         if acctLv is not None:
             params['acctLv'] = acctLv
         if inclRealPosAndEq is not None:
             params['inclRealPosAndEq'] = inclRealPosAndEq
         if lever is not None:
-            params['spotOffsetType'] = lever
+            params['lever'] = lever
         if greeksType is not None:
-            params['greksType'] = greeksType
+            params['greeksType'] = greeksType
         if simPos is not None:
             params['simPos'] = simPos
         if simAsset is not None:
             params['simAsset'] = simAsset
+        if idxVol is not None:
+            params['idxVol'] = idxVol
         return self._request_with_params(POST, POSITION_BUILDER, params)
 
     # Get Bills Details (recent 7 days)
     def get_account_bills(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_DETAIL, params)
 
     # Get Bills Details (recent 3 months)
@@ -74,14 +76,18 @@ class AccountAPI(OkxClient):
         return self._request_with_params(POST, SET_LEVERAGE, params)
 
     # Get Maximum Tradable Size For Instrument
-    def get_max_order_size(self, instId, tdMode, ccy='', px=''):
+    def get_max_order_size(self, instId, tdMode, ccy='', px='', tradeQuoteCcy=None):
         params = {'instId': instId, 'tdMode': tdMode, 'ccy': ccy, 'px': px}
+        if tradeQuoteCcy is not None:
+            params['tradeQuoteCcy'] = tradeQuoteCcy
         return self._request_with_params(GET, MAX_TRADE_SIZE, params)
 
     # Get Maximum Available Tradable Amount
-    def get_max_avail_size(self, instId, tdMode, ccy='', reduceOnly='', unSpotOffset='', quickMgnType=''):
+    def get_max_avail_size(self, instId, tdMode, ccy='', reduceOnly='', unSpotOffset='', quickMgnType='', tradeQuoteCcy=None):
         params = {'instId': instId, 'tdMode': tdMode, 'ccy': ccy, 'reduceOnly': reduceOnly,
                   'unSpotOffset': unSpotOffset, 'quickMgnType': quickMgnType}
+        if tradeQuoteCcy is not None:
+            params['tradeQuoteCcy'] = tradeQuoteCcy
         return self._request_with_params(GET, MAX_AVAIL_SIZE, params)
 
     # Increase / Decrease margin
@@ -100,13 +106,17 @@ class AccountAPI(OkxClient):
         return self._request_with_params(GET, GET_INSTRUMENTS, params)
 
     # Get the maximum loan of isolated MARGIN
-    def get_max_loan(self, instId, mgnMode, mgnCcy=''):
+    def get_max_loan(self, instId, mgnMode, mgnCcy='', tradeQuoteCcy=None):
         params = {'instId': instId, 'mgnMode': mgnMode, 'mgnCcy': mgnCcy}
+        if tradeQuoteCcy is not None:
+            params['tradeQuoteCcy'] = tradeQuoteCcy
         return self._request_with_params(GET, MAX_LOAN, params)
 
     # Get Fee Rates
-    def get_fee_rates(self, instType, instId='', uly='', category='', instFamily=''):
+    def get_fee_rates(self, instType, instId='', uly='', category='', instFamily='', groupId=None):
         params = {'instType': instType, 'instId': instId, 'uly': uly, 'category': category, 'instFamily': instFamily}
+        if groupId is not None:
+            params['groupId'] = groupId
         return self._request_with_params(GET, FEE_RATES, params)
 
     # Get interest-accrued
@@ -323,3 +333,36 @@ class AccountAPI(OkxClient):
     def spot_borrow_repay_history(self, ccy='', type='', after='', before='', limit=''):
         params = {'ccy': ccy, 'type': type, 'after': after, 'before': before, 'limit': limit}
         return self._request_with_params(GET, GET_BORROW_REPAY_HISTORY, params)
+
+    def set_auto_earn(self, ccy, action, earnType=None):
+        params = {'ccy': ccy, 'action': action}
+        if earnType is not None:
+            params['earnType'] = earnType
+        return self._request_with_params(POST, SET_AUTO_EARN, params)
+
+    # Set trading config (BROK-1724). type is required (e.g. 'stgyType');
+    # stgyType (0=general, 1=delta neutral) applies only when type == 'stgyType'.
+    def set_trading_config(self, type='', stgyType=''):
+        params = {'type': type}
+        if stgyType != '':
+            params['stgyType'] = stgyType
+        return self._request_with_params(POST, SET_TRADING_CONFIG, params)
+
+    # Pre-check whether the delta-neutral switch is allowed (BROK-1724)
+    def precheck_set_delta_neutral(self, stgyType=''):
+        params = {'stgyType': stgyType}
+        return self._request_with_params(GET, PRECHECK_SET_DELTA_NEUTRAL, params)
+
+    # Get the list of supported bill subtypes (BROK-1728)
+    def get_bill_type(self, type=''):
+        params = {}
+        if type != '':
+            params['type'] = type
+        return self._request_with_params(GET, BILL_TYPE, params)
+
+    # Apply for an asynchronous bill history archive by year + quarter (BROK-1728)
+    def apply_bills(self, year='', quarter='', type=''):
+        params = {'year': year, 'quarter': quarter}
+        if type != '':
+            params['type'] = type
+        return self._request_with_params(POST, BILLS_APPLY, params)

{python_okx-0.3.9 → python_okx-0.4.2}/okx/Convert.py

@@ -10,16 +10,22 @@ class ConvertAPI(OkxClient):
         params = {}
         return self._request_with_params(GET, GET_CURRENCIES, params)
 
-    def get_currency_pair(self, fromCcy='', toCcy=''):
+    def get_currency_pair(self, fromCcy='', toCcy='', convertMode=None):
         params = {"fromCcy": fromCcy, 'toCcy': toCcy}
+        if convertMode is not None:
+            params['convertMode'] = convertMode
         return self._request_with_params(GET, GET_CURRENCY_PAIR, params)
 
-    def estimate_quote(self, baseCcy = '', quoteCcy = '', side = '', rfqSz = '', rfqSzCcy = '', clQReqId = '',tag=''):
+    def estimate_quote(self, baseCcy = '', quoteCcy = '', side = '', rfqSz = '', rfqSzCcy = '', clQReqId = '',tag='', convertMode=None):
         params = {'baseCcy': baseCcy, 'quoteCcy': quoteCcy, 'side':side, 'rfqSz':rfqSz, 'rfqSzCcy':rfqSzCcy, 'clQReqId':clQReqId,'tag':tag}
+        if convertMode is not None:
+            params['convertMode'] = convertMode
         return self._request_with_params(POST, ESTIMATE_QUOTE, params)
 
-    def convert_trade(self, quoteId = '', baseCcy = '', quoteCcy = '', side = '', sz = '', szCcy = '', clTReqId = '',tag=''):
+    def convert_trade(self, quoteId = '', baseCcy = '', quoteCcy = '', side = '', sz = '', szCcy = '', clTReqId = '',tag='', convertMode=None):
         params = {'quoteId': quoteId, 'baseCcy': baseCcy, 'quoteCcy':quoteCcy, 'side':side, 'sz':sz, 'szCcy':szCcy, 'clTReqId':clTReqId,'tag':tag}
+        if convertMode is not None:
+            params['convertMode'] = convertMode
         return self._request_with_params(POST, CONVERT_TRADE, params)
 
     def get_convert_history(self, after = '', before = '', limit = '',tag=''):

python_okx-0.4.2/okx/DualInvest.py

@@ -0,0 +1,59 @@
+from .okxclient import OkxClient
+from .consts import (
+    GET,
+    POST,
+    DUAL_INVEST_CURRENCY_PAIRS,
+    DUAL_INVEST_PRODUCT_INFO,
+    DUAL_INVEST_REQUEST_QUOTE,
+    DUAL_INVEST_TRADE,
+    DUAL_INVEST_REQUEST_REDEEM_QUOTE,
+    DUAL_INVEST_REDEEM,
+    DUAL_INVEST_ORDER_STATE,
+    DUAL_INVEST_ORDER_HISTORY,
+)
+
+
+class DualInvestAPI(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=False, proxy=None):  # NOSONAR - '-1' is the SDK-wide "no credential supplied" sentinel (auth is gated on api_key != '-1' in OkxClient), not a hard-coded secret
+        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
+
+    # GET /api/v5/finance/sfp/dcd/currency-pair
+    def get_currency_pairs(self):
+        return self._request_without_params(GET, DUAL_INVEST_CURRENCY_PAIRS)
+
+    # GET /api/v5/finance/sfp/dcd/products
+    def get_product_info(self, baseCcy='', quoteCcy='', optType=''):
+        params = {'baseCcy': baseCcy, 'quoteCcy': quoteCcy, 'optType': optType}
+        return self._request_with_params(GET, DUAL_INVEST_PRODUCT_INFO, params)
+
+    # POST /api/v5/finance/sfp/dcd/quote
+    def request_quote(self, productId='', notionalSz='', notionalCcy=''):
+        params = {'productId': productId, 'notionalSz': notionalSz, 'notionalCcy': notionalCcy}
+        return self._request_with_params(POST, DUAL_INVEST_REQUEST_QUOTE, params)
+
+    # POST /api/v5/finance/sfp/dcd/trade
+    def trade(self, quoteId=''):
+        params = {'quoteId': quoteId}
+        return self._request_with_params(POST, DUAL_INVEST_TRADE, params)
+
+    # POST /api/v5/finance/sfp/dcd/redeem-quote
+    def request_redeem_quote(self, ordId=''):
+        params = {'ordId': ordId}
+        return self._request_with_params(POST, DUAL_INVEST_REQUEST_REDEEM_QUOTE, params)
+
+    # POST /api/v5/finance/sfp/dcd/redeem
+    def redeem(self, ordId='', quoteId=''):
+        params = {'ordId': ordId, 'quoteId': quoteId}
+        return self._request_with_params(POST, DUAL_INVEST_REDEEM, params)
+
+    # GET /api/v5/finance/sfp/dcd/order-status
+    def get_order_state(self, ordId=''):
+        params = {'ordId': ordId}
+        return self._request_with_params(GET, DUAL_INVEST_ORDER_STATE, params)
+
+    # GET /api/v5/finance/sfp/dcd/order-history
+    def get_order_history(self, ordId='', productId='', uly='', state='',
+                          beginId='', endId='', begin='', end='', limit=''):
+        params = {'ordId': ordId, 'productId': productId, 'uly': uly, 'state': state,
+                  'beginId': beginId, 'endId': endId, 'begin': begin, 'end': end, 'limit': limit}
+        return self._request_with_params(GET, DUAL_INVEST_ORDER_HISTORY, params)

{python_okx-0.3.9 → python_okx-0.4.2}/okx/Finance/SolStaking.py

@@ -46,3 +46,6 @@ class SolStakingAPI(OkxClient):
             'days': days,
         }
         return self._request_with_params(GET, STACK_SOL_APY_HISTORY, params)
+
+    def sol_product_info(self):
+        return self._request_without_params(GET, STACK_SOL_PRODUCT_INFO)

{python_okx-0.3.9 → python_okx-0.4.2}/okx/Funding.py

@@ -35,9 +35,11 @@ class FundingAPI(OkxClient):
         return self._request_with_params(POST, FUNDS_TRANSFER, params)
 
     # Withdrawal
-    def withdrawal(self, ccy, amt, dest, toAddr, chain='', areaCode='', clientId=''):
+    def withdrawal(self, ccy, amt, dest, toAddr, chain='', areaCode='', clientId='', toAddrType=None):
         params = {'ccy': ccy, 'amt': amt, 'dest': dest, 'toAddr': toAddr, 'chain': chain,
                   'areaCode': areaCode, 'clientId': clientId}
+        if toAddrType is not None:
+            params['toAddrType'] = toAddrType
         return self._request_with_params(POST, WITHDRAWAL_COIN, params)
 
     # Get Deposit History
@@ -46,10 +48,7 @@ class FundingAPI(OkxClient):
                   'depId': depId, 'fromWdId': fromWdId}
         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_HISTORY, params)
+
 
     # Get Currencies
     def get_currencies(self, ccy=''):
@@ -113,7 +112,9 @@ class FundingAPI(OkxClient):
         return self._request_with_params(GET, GET_DEPOSIT_WITHDrAW_STATUS, params)
 
     #Get withdrawal history
-    def get_withdrawal_history(self, ccy='', wdId='', clientId='', txId='', type='', state='', after='', before	='', limit=''):
+    def get_withdrawal_history(self, ccy='', wdId='', clientId='', txId='', type='', state='', after='', before='', limit='', toAddrType=None):
         params = {'ccy': ccy, 'wdId': wdId, 'clientId': clientId, 'txId': txId, 'type': type, 'state': state, 'after': after, 'before': before, 'limit': limit}
+        if toAddrType is not None:
+            params['toAddrType'] = toAddrType
         return self._request_with_params(GET, GET_WITHDRAWAL_HISTORY, params)
 

{python_okx-0.3.9 → python_okx-0.4.2}/okx/Grid.py

@@ -7,11 +7,13 @@ class GridAPI(OkxClient):
         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='',
-                        slTriggerPx='', tag='', quoteSz='', baseSz='', sz='', direction='', lever='', basePos=''):
+                        slTriggerPx='', tag='', quoteSz='', baseSz='', sz='', direction='', lever='', basePos='', tradeQuoteCcy=None):
         params = {'instId': instId, 'algoOrdType': algoOrdType, 'maxPx': maxPx, 'minPx': minPx, 'gridNum': gridNum,
                   'runType': runType, 'tpTriggerPx': tpTriggerPx, 'slTriggerPx': slTriggerPx, 'tag': tag,
                   'quoteSz': quoteSz, 'baseSz': baseSz, 'sz': sz, 'direction': direction, 'lever': lever,
                   'basePos': basePos}
+        if tradeQuoteCcy is not None:
+            params['tradeQuoteCcy'] = tradeQuoteCcy
         return self._request_with_params(POST, GRID_ORDER_ALGO, params)
 
     def grid_amend_order_algo(self, algoId='', instId='', slTriggerPx='', tpTriggerPx=''):
@@ -79,11 +81,13 @@ class GridAPI(OkxClient):
 
     # - Place recurring buy order
     def place_recurring_buy_order(self, stgyName='', recurringList=[], period='', recurringDay='', recurringTime='',
-                                  timeZone='', amt='', investmentCcy='', tdMode='', algoClOrdId='', tag=''):
+                                  timeZone='', amt='', investmentCcy='', tdMode='', algoClOrdId='', tag='', tradeQuoteCcy=None):
         params = {'stgyName': stgyName, 'recurringList': recurringList, 'period': period, 'recurringDay': recurringDay,
                   'recurringTime': recurringTime,
                   'timeZone': timeZone, 'amt': amt, 'investmentCcy': investmentCcy, 'tdMode': tdMode,
                   'algoClOrdId': algoClOrdId, 'tag': tag}
+        if tradeQuoteCcy is not None:
+            params['tradeQuoteCcy'] = tradeQuoteCcy
         return self._request_with_params(POST, PLACE_RECURRING_BUY_ORDER, params)
 
     # - Amend recurring buy order

{python_okx-0.3.9 → python_okx-0.4.2}/okx/PublicData.py

@@ -122,3 +122,23 @@ class PublicAPI(OkxClient):
             'optType': optType
         }
         return self._request_with_params(GET, GET_OPTION_TRADES, params)
+
+    # Get historical market data
+    def get_market_data_history(self, module, instType, dateAggrType, begin, end, instIdList=None, instFamilyList=None):
+        params = {
+            'module': module,
+            'instType': instType,
+            'dateAggrType': dateAggrType,
+            'begin': begin,
+            'end': end
+        }
+        if instIdList is not None:
+            params['instIdList'] = instIdList
+        if instFamilyList is not None:
+            params['instFamilyList'] = instFamilyList
+        return self._request_with_params(GET, MARKET_DATA_HISTORY, params)
+
+    # Get announcements (BROK-1730)
+    def get_announcements(self, annType='', page=''):
+        params = {'annType': annType, 'page': page}
+        return self._request_with_params(GET, ANNOUNCEMENTS, params)