Skip to content

fix(rest): send the order identifier params that were declared but dropped #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pucedoteth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(rest): send the order identifier params that were declared but dropped #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions aster/rest_api/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from aster.lib.utils import check_required_parameter
from aster.lib.utils import check_required_parameters
from aster.lib.utils import convert_list_to_json_array


def change_position_mode(self, dualSidePosition: str, **kwargs):
Expand Down Expand Up @@ -113,7 +114,12 @@ def query_order(self, symbol: str, orderId: int = None, origClientOrderId: str =
"""

check_required_parameter(symbol, "symbol")
params = {"symbol": symbol, **kwargs}
params = {
"symbol": symbol,
"orderId": orderId,
"origClientOrderId": origClientOrderId,
**kwargs,
}
url_path = "/fapi/v1/order"
return self.sign_request("GET", url_path, params)

Expand All @@ -131,7 +137,12 @@ def cancel_order(self, symbol: str, orderId: int = None, origClientOrderId: str
"""

check_required_parameter(symbol, "symbol")
params = {"symbol": symbol, **kwargs}
params = {
"symbol": symbol,
"orderId": orderId,
"origClientOrderId": origClientOrderId,
**kwargs,
}
url_path = "/fapi/v1/order"
return self.sign_request("DELETE", url_path, params)

Expand All @@ -152,7 +163,7 @@ def cancel_open_orders(self, symbol: str, **kwargs):
return self.sign_request("DELETE", url_path, params)


def cancel_batch_order(self, symbol: str, orderIdList: list, origClientOrderIdList: list, **kwargs):
def cancel_batch_order(self, symbol: str, orderIdList: list = None, origClientOrderIdList: list = None, **kwargs):
"""
|
| **Cancel Multiple Orders (TRADE)**
Expand All @@ -164,7 +175,14 @@ def cancel_batch_order(self, symbol: str, orderIdList: list, origClientOrderIdLi
"""

check_required_parameter(symbol, "symbol")
params = {"symbol": symbol, **kwargs}
params = {
"symbol": symbol,
# the endpoint takes these as JSON arrays with no spaces, e.g.
# orderIdList=[1234567,2345678] and origClientOrderIdList=["id1","id2"]
"orderIdList": convert_list_to_json_array(orderIdList),
"origClientOrderIdList": convert_list_to_json_array(origClientOrderIdList),
**kwargs,
}
url_path = "/fapi/v1/batchOrders"
return self.sign_request("DELETE", url_path, params)

Expand Down Expand Up @@ -198,7 +216,12 @@ def get_open_orders(self, symbol: str, orderId: int = None, origClientOrderId: s
"""

check_required_parameter(symbol, "symbol")
params = {"symbol": symbol, **kwargs}
params = {
"symbol": symbol,
"orderId": orderId,
"origClientOrderId": origClientOrderId,
**kwargs,
}
url_path = "/fapi/v1/openOrder"
return self.sign_request("GET", url_path, params)

Expand Down