Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions datamaxi/aio/cex.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ async def __call__(
symbol: str,
currency: str = USD,
interval: Interval = INTERVAL_1D,
from_unix: str = None,
to_unix: str = None,
from_unix: Optional[str] = None,
to_unix: Optional[str] = None,
pandas: bool = True,
) -> Union[pd.DataFrame, CandleResponse]:
"""Fetch candle data (async). See ``datamaxi.Datamaxi.cex.candle``."""
Expand Down Expand Up @@ -79,7 +79,7 @@ async def exchanges(self, market: Market) -> List[str]:
return await self.request_endpoint("cex_candle_exchanges", market=market)

async def symbols(
self, exchange: str = None, market: Optional[Market] = None
self, exchange: Optional[str] = None, market: Optional[Market] = None
) -> List[Dict]:
if market is not None and market not in [SPOT, FUTURES]:
raise ValueError("market must be either spot or futures")
Expand All @@ -97,8 +97,8 @@ async def get(
exchange: str,
symbol: str,
market: Market,
currency: str = None,
conversion_base: str = None,
currency: Optional[str] = None,
conversion_base: Optional[str] = None,
include_source: bool = False,
pandas: bool = True,
) -> Union[pd.DataFrame, TickerResponse]:
Expand Down Expand Up @@ -154,8 +154,8 @@ async def symbols(self, exchange: str, market: Market) -> List[str]:
class AsyncCexFee(AsyncResource):
async def __call__(
self,
exchange: str = None,
symbol: str = None,
exchange: Optional[str] = None,
symbol: Optional[str] = None,
) -> List[Dict]:
return await self.request_endpoint("cex_fees", exchange=exchange, symbol=symbol)

Expand Down
10 changes: 5 additions & 5 deletions datamaxi/aio/funding_rate.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from __future__ import annotations

from typing import Callable, Tuple, List, Union, TYPE_CHECKING
from typing import Callable, Tuple, List, Union, Optional, TYPE_CHECKING

from datamaxi.aio._core import AsyncResource
from datamaxi.lib.utils import check_required_parameter, check_required_parameters
Expand All @@ -20,8 +20,8 @@ async def history(
symbol: str,
page: int = 1,
limit: int = 1000,
fromDateTime: str = None,
toDateTime: str = None,
fromDateTime: Optional[str] = None,
toDateTime: Optional[str] = None,
sort: SortOrder = DESC,
pandas: bool = True,
) -> Union[Tuple[pd.DataFrame, Callable], Tuple[FundingHistoryResponse, Callable]]:
Expand Down Expand Up @@ -75,8 +75,8 @@ async def next_request():

async def latest(
self,
exchange: str = None,
symbol: str = None,
exchange: Optional[str] = None,
symbol: Optional[str] = None,
pandas: bool = True,
) -> Union[pd.DataFrame, LatestFundingRate]:
res = await self.request_endpoint(
Expand Down
30 changes: 15 additions & 15 deletions datamaxi/aio/premium.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
class AsyncPremium(AsyncResource):
async def __call__( # noqa: C901
self,
source_exchange: str = None,
target_exchange: str = None,
asset: str = None,
source_quote: str = None,
target_quote: str = None,
source_exchange: Optional[str] = None,
target_exchange: Optional[str] = None,
asset: Optional[str] = None,
source_quote: Optional[str] = None,
target_quote: Optional[str] = None,
sort: Optional[SortOrder] = None,
key: str = None,
key: Optional[str] = None,
page: int = 1,
limit: int = 100,
currency: str = None,
conversion_base: str = None,
min_sv: str = None,
min_tv: str = None,
currency: Optional[str] = None,
conversion_base: Optional[str] = None,
min_sv: Optional[str] = None,
min_tv: Optional[str] = None,
source_market: Optional[Market] = None,
target_market: Optional[Market] = None,
only_transferable: bool = False,
network: str = None,
premium_type: str = None,
token_include: str = None,
token_exclude: str = None,
query: str = None,
network: Optional[str] = None,
premium_type: Optional[str] = None,
token_include: Optional[str] = None,
token_exclude: Optional[str] = None,
query: Optional[str] = None,
pandas: bool = True,
) -> Union[pd.DataFrame, PremiumResponse]:
params = {}
Expand Down
6 changes: 3 additions & 3 deletions datamaxi/resources/cex_candle.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def __call__(
symbol: str,
currency: str = USD,
interval: Interval = INTERVAL_1D,
from_unix: str = None,
to_unix: str = None,
from_unix: Optional[str] = None,
to_unix: Optional[str] = None,
pandas: bool = True,
) -> Union[pd.DataFrame, CandleResponse]:
"""Fetch candle data
Expand Down Expand Up @@ -108,7 +108,7 @@ def exchanges(self, market: Market) -> List[str]:
return self.request_endpoint("cex_candle_exchanges", market=market)

def symbols(
self, exchange: str = None, market: Optional[Market] = None
self, exchange: Optional[str] = None, market: Optional[Market] = None
) -> List[Dict]:
"""Fetch supported symbols for candle data.

Expand Down
6 changes: 3 additions & 3 deletions datamaxi/resources/cex_fee.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Any, List, Dict
from typing import Any, List, Dict, Optional
from datamaxi.api import Resource
from datamaxi.lib.utils import check_required_parameter

Expand All @@ -17,8 +17,8 @@ def __init__(self, api_key=None, **kwargs: Any):

def __call__(
self,
exchange: str = None,
symbol: str = None,
exchange: Optional[str] = None,
symbol: Optional[str] = None,
) -> List[Dict]:
"""Fetch trading fee data

Expand Down
6 changes: 3 additions & 3 deletions datamaxi/resources/cex_ticker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from typing import Any, List, Union, TYPE_CHECKING
from typing import Any, List, Union, Optional, TYPE_CHECKING
from datamaxi.api import Resource
from datamaxi.lib.utils import check_required_parameters
from datamaxi.resources.responses import TickerResponse
Expand All @@ -27,8 +27,8 @@ def get(
exchange: str,
symbol: str,
market: Market,
currency: str = None,
conversion_base: str = None,
currency: Optional[str] = None,
conversion_base: Optional[str] = None,
include_source: bool = False,
pandas: bool = True,
) -> Union[pd.DataFrame, TickerResponse]:
Expand Down
10 changes: 5 additions & 5 deletions datamaxi/resources/funding_rate.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from typing import Any, Callable, Tuple, List, Union, TYPE_CHECKING
from typing import Any, Callable, Tuple, List, Union, Optional, TYPE_CHECKING
from datamaxi.api import Resource
from datamaxi.lib.utils import check_required_parameter
from datamaxi.lib.utils import check_required_parameters
Expand Down Expand Up @@ -30,8 +30,8 @@ def history(
symbol: str,
page: int = 1,
limit: int = 1000,
fromDateTime: str = None,
toDateTime: str = None,
fromDateTime: Optional[str] = None,
toDateTime: Optional[str] = None,
sort: SortOrder = DESC,
pandas: bool = True,
) -> Union[Tuple[pd.DataFrame, Callable], Tuple[FundingHistoryResponse, Callable]]:
Expand Down Expand Up @@ -107,8 +107,8 @@ def next_request():

def latest(
self,
exchange: str = None,
symbol: str = None,
exchange: Optional[str] = None,
symbol: Optional[str] = None,
pandas: bool = True,
) -> Union[pd.DataFrame, LatestFundingRate]:
"""Fetch latest funding rate data
Expand Down
30 changes: 15 additions & 15 deletions datamaxi/resources/premium.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ def __init__(self, api_key=None, **kwargs: Any):

def __call__( # noqa: C901
self,
source_exchange: str = None,
target_exchange: str = None,
asset: str = None,
source_quote: str = None,
target_quote: str = None,
source_exchange: Optional[str] = None,
target_exchange: Optional[str] = None,
asset: Optional[str] = None,
source_quote: Optional[str] = None,
target_quote: Optional[str] = None,
sort: Optional[SortOrder] = None,
key: str = None,
key: Optional[str] = None,
page: int = 1,
limit: int = 100,
currency: str = None,
conversion_base: str = None,
min_sv: str = None,
min_tv: str = None,
currency: Optional[str] = None,
conversion_base: Optional[str] = None,
min_sv: Optional[str] = None,
min_tv: Optional[str] = None,
source_market: Optional[Market] = None,
target_market: Optional[Market] = None,
only_transferable: bool = False,
network: str = None,
premium_type: str = None,
token_include: str = None,
token_exclude: str = None,
query: str = None,
network: Optional[str] = None,
premium_type: Optional[str] = None,
token_include: Optional[str] = None,
token_exclude: Optional[str] = None,
query: Optional[str] = None,
pandas: bool = True,
) -> Union[pd.DataFrame, PremiumResponse]:
"""Fetch premium data
Expand Down
Loading