aljaz/bitfinex-api-py
1
0
Fork 0
mirror of https://github.com/aljazceru/bitfinex-api-py.git synced 2025-12-19 06:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix several bugs in sub-package bfxapi.rest.endpoints.

Browse Source
This commit is contained in:
Davide Casale
2023-10-26 16:48:05 +02:00
parent 8c65ba54e9
commit 9287723678
4 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
bfxapi/rest/endpoints/rest_auth_endpoints.py
View File

@@ -1,4 +1,4 @@
from typing import Dict, List, Tuple, Union, Literal, Optional, Any from typing import Dict, List, Tuple, Union, Literal, Optional
from decimal import Decimal from decimal import Decimal
@@ -63,24 +63,22 @@ class RestAuthEndpoints(Middleware):
def submit_order(self, def submit_order(self,
type: str, type: str,
symbol: str, symbol: str,
amount: Union[Decimal, float, str], amount: Union[str, float, Decimal],
price: Union[str, float, Decimal],
*, *,
price: Optional[Union[Decimal, float, str]] = None,
lev: Optional[int] = None, lev: Optional[int] = None,
price_trailing: Optional[Union[Decimal, float, str]] = None, price_trailing: Optional[Union[str, float, Decimal]] = None,
price_aux_limit: Optional[Union[Decimal, float, str]] = None, price_aux_limit: Optional[Union[str, float, Decimal]] = None,
price_oco_stop: Optional[Union[Decimal, float, str]] = None, price_oco_stop: Optional[Union[str, float, Decimal]] = None,
gid: Optional[int] = None, gid: Optional[int] = None,
cid: Optional[int] = None, cid: Optional[int] = None,
flags: Optional[int] = 0, flags: Optional[int] = None,
tif: Optional[str] = None, tif: Optional[str] = None) -> Notification[Order]:
meta: Optional[Dict[str, Any]] = None) -> Notification[Order]:
body = { body = {
"type": type, "symbol": symbol, "amount": amount, "type": type, "symbol": symbol, "amount": amount,
"price": price, "lev": lev, "price_trailing": price_trailing, "price": price, "lev": lev, "price_trailing": price_trailing,
"price_aux_limit": price_aux_limit, "price_oco_stop": price_oco_stop, "gid": gid, "price_aux_limit": price_aux_limit, "price_oco_stop": price_oco_stop, "gid": gid,
"cid": cid, "flags": flags, "tif": tif, "cid": cid, "flags": flags, "tif": tif
"meta": meta
} }
return _Notification[Order](serializers.Order) \ return _Notification[Order](serializers.Order) \
@@ -89,16 +87,16 @@ class RestAuthEndpoints(Middleware):
def update_order(self, def update_order(self,
id: int, id: int,
*, *,
amount: Optional[Union[Decimal, float, str]] = None, amount: Optional[Union[str, float, Decimal]] = None,
price: Optional[Union[Decimal, float, str]] = None, price: Optional[Union[str, float, Decimal]] = None,
cid: Optional[int] = None, cid: Optional[int] = None,
cid_date: Optional[str] = None, cid_date: Optional[str] = None,
gid: Optional[int] = None, gid: Optional[int] = None,
flags: Optional[int] = 0, flags: Optional[int] = None,
lev: Optional[int] = None, lev: Optional[int] = None,
delta: Optional[Union[Decimal, float, str]] = None, delta: Optional[Union[str, float, Decimal]] = None,
price_aux_limit: Optional[Union[Decimal, float, str]] = None, price_aux_limit: Optional[Union[str, float, Decimal]] = None,
price_trailing: Optional[Union[Decimal, float, str]] = None, price_trailing: Optional[Union[str, float, Decimal]] = None,
tif: Optional[str] = None) -> Notification[Order]: tif: Optional[str] = None) -> Notification[Order]:
body = { body = {
"id": id, "amount": amount, "price": price, "id": id, "amount": amount, "price": price,
@@ -124,7 +122,7 @@ class RestAuthEndpoints(Middleware):
id: Optional[List[int]] = None, id: Optional[List[int]] = None,
cid: Optional[List[Tuple[int, str]]] = None, cid: Optional[List[Tuple[int, str]]] = None,
gid: Optional[List[int]] = None, gid: Optional[List[int]] = None,
all: bool = False) -> Notification[List[Order]]: all: Optional[bool] = None) -> Notification[List[Order]]:
body = { body = {
"id": id, "cid": cid, "gid": gid, "id": id, "cid": cid, "gid": gid,
"all": all "all": all
@@ -211,21 +209,21 @@ class RestAuthEndpoints(Middleware):
def claim_position(self, def claim_position(self,
id: int, id: int,
*, *,
amount: Optional[Union[Decimal, float, str]] = None) -> Notification[PositionClaim]: amount: Optional[Union[str, float, Decimal]] = None) -> Notification[PositionClaim]:
return _Notification[PositionClaim](serializers.PositionClaim) \ return _Notification[PositionClaim](serializers.PositionClaim) \
.parse(*self._post("auth/w/position/claim", \ .parse(*self._post("auth/w/position/claim", \
body={ "id": id, "amount": amount })) body={ "id": id, "amount": amount }))
def increase_position(self, def increase_position(self,
symbol: str, symbol: str,
amount: Union[Decimal, float, str]) -> Notification[PositionIncrease]: amount: Union[str, float, Decimal]) -> Notification[PositionIncrease]:
return _Notification[PositionIncrease](serializers.PositionIncrease) \ return _Notification[PositionIncrease](serializers.PositionIncrease) \
.parse(*self._post("auth/w/position/increase", \ .parse(*self._post("auth/w/position/increase", \
body={ "symbol": symbol, "amount": amount })) body={ "symbol": symbol, "amount": amount }))
def get_increase_position_info(self, def get_increase_position_info(self,
symbol: str, symbol: str,
amount: Union[Decimal, float, str]) -> PositionIncreaseInfo: amount: Union[str, float, Decimal]) -> PositionIncreaseInfo:
return serializers.PositionIncreaseInfo \ return serializers.PositionIncreaseInfo \
.parse(*self._post("auth/r/position/increase/info", \ .parse(*self._post("auth/r/position/increase/info", \
body={ "symbol": symbol, "amount": amount })) body={ "symbol": symbol, "amount": amount }))
@@ -264,7 +262,7 @@ class RestAuthEndpoints(Middleware):
def set_derivative_position_collateral(self, def set_derivative_position_collateral(self,
symbol: str, symbol: str,
collateral: Union[Decimal, float, str]) -> DerivativePositionCollateral: collateral: Union[str, float, Decimal]) -> DerivativePositionCollateral:
return serializers.DerivativePositionCollateral \ return serializers.DerivativePositionCollateral \
.parse(*(self._post("auth/w/deriv/collateral/set", \ .parse(*(self._post("auth/w/deriv/collateral/set", \
body={ "symbol": symbol, "collateral": collateral })[0])) body={ "symbol": symbol, "collateral": collateral })[0]))
@@ -285,11 +283,11 @@ class RestAuthEndpoints(Middleware):
def submit_funding_offer(self, def submit_funding_offer(self,
type: str, type: str,
symbol: str, symbol: str,
amount: Union[Decimal, float, str], amount: Union[str, float, Decimal],
rate: Union[Decimal, float, str], rate: Union[str, float, Decimal],
period: int, period: int,
*, *,
flags: Optional[int] = 0) -> Notification[FundingOffer]: flags: Optional[int] = None) -> Notification[FundingOffer]:
body = { body = {
"type": type, "symbol": symbol, "amount": amount, "type": type, "symbol": symbol, "amount": amount,
"rate": rate, "period": period, "flags": flags "rate": rate, "period": period, "flags": flags
@@ -420,7 +418,7 @@ class RestAuthEndpoints(Middleware):
to_wallet: str, to_wallet: str,
currency: str, currency: str,
currency_to: str, currency_to: str,
amount: Union[Decimal, float, str]) -> Notification[Transfer]: amount: Union[str, float, Decimal]) -> Notification[Transfer]:
body = { body = {
"from": from_wallet, "to": to_wallet, "currency": currency, "from": from_wallet, "to": to_wallet, "currency": currency,
"currency_to": currency_to, "amount": amount "currency_to": currency_to, "amount": amount
@@ -433,7 +431,7 @@ class RestAuthEndpoints(Middleware):
wallet: str, wallet: str,
method: str, method: str,
address: str, address: str,
amount: Union[Decimal, float, str]) -> Notification[Withdrawal]: amount: Union[str, float, Decimal]) -> Notification[Withdrawal]:
body = { body = {
"wallet": wallet, "method": method, "address": address, "wallet": wallet, "method": method, "address": address,
"amount": amount "amount": amount
@@ -453,7 +451,7 @@ class RestAuthEndpoints(Middleware):
def generate_deposit_invoice(self, def generate_deposit_invoice(self,
wallet: str, wallet: str,
currency: str, currency: str,
amount: Union[Decimal, float, str]) -> LightningNetworkInvoice: amount: Union[str, float, Decimal]) -> LightningNetworkInvoice:
return serializers.LightningNetworkInvoice \ return serializers.LightningNetworkInvoice \
.parse(*self._post("auth/w/deposit/invoice", \ .parse(*self._post("auth/w/deposit/invoice", \
body={ "wallet": wallet, "currency": currency, "amount": amount })) body={ "wallet": wallet, "currency": currency, "amount": amount }))

2
bfxapi/rest/endpoints/rest_merchant_endpoints.py
View File

@@ -30,7 +30,7 @@ _CustomerInfo = TypedDict("_CustomerInfo", {
class RestMerchantEndpoints(Middleware): class RestMerchantEndpoints(Middleware):
#pylint: disable-next=too-many-arguments #pylint: disable-next=too-many-arguments
def submit_invoice(self, def submit_invoice(self,
amount: Union[Decimal, float, str], amount: Union[str, float, Decimal],
currency: str, currency: str,
order_id: str, order_id: str,
customer_info: _CustomerInfo, customer_info: _CustomerInfo,

8
bfxapi/rest/endpoints/rest_public_endpoints.py
View File

@@ -270,9 +270,9 @@ class RestPublicEndpoints(Middleware):
def get_trading_market_average_price(self, def get_trading_market_average_price(self,
symbol: str, symbol: str,
amount: Union[Decimal, float, str], amount: Union[str, float, Decimal],
*, *,
price_limit: Optional[Union[Decimal, float, str]] = None price_limit: Optional[Union[str, float, Decimal]] = None
) -> TradingMarketAveragePrice: ) -> TradingMarketAveragePrice:
return serializers.TradingMarketAveragePrice.parse(*self._post("calc/trade/avg", body={ return serializers.TradingMarketAveragePrice.parse(*self._post("calc/trade/avg", body={
"symbol": symbol, "amount": amount, "price_limit": price_limit "symbol": symbol, "amount": amount, "price_limit": price_limit
@@ -280,10 +280,10 @@ class RestPublicEndpoints(Middleware):
def get_funding_market_average_price(self, def get_funding_market_average_price(self,
symbol: str, symbol: str,
amount: Union[Decimal, float, str], amount: Union[str, float, Decimal],
period: int, period: int,
*, *,
rate_limit: Optional[Union[Decimal, float, str]] = None rate_limit: Optional[Union[str, float, Decimal]] = None
) -> FundingMarketAveragePrice: ) -> FundingMarketAveragePrice:
return serializers.FundingMarketAveragePrice.parse(*self._post("calc/trade/avg", body={ return serializers.FundingMarketAveragePrice.parse(*self._post("calc/trade/avg", body={
"symbol": symbol, "amount": amount, "period": period, "rate_limit": rate_limit "symbol": symbol, "amount": amount, "period": period, "rate_limit": rate_limit

2
bfxapi/websocket/_client/bfx_websocket_inputs.py
View File

@@ -29,7 +29,7 @@ class BfxWebSocketInputs:
"type": type, "symbol": symbol, "amount": amount, "type": type, "symbol": symbol, "amount": amount,
"price": price, "lev": lev, "price_trailing": price_trailing, "price": price, "lev": lev, "price_trailing": price_trailing,
"price_aux_limit": price_aux_limit, "price_oco_stop": price_oco_stop, "gid": gid, "price_aux_limit": price_aux_limit, "price_oco_stop": price_oco_stop, "gid": gid,
"cid": cid, "flags": flags, "tif": tif, "cid": cid, "flags": flags, "tif": tif
}) })
async def update_order(self, async def update_order(self,