Apply isort to all python files (bfxapi/**/*.py).

bfxapi/__init__.py

@@ -1,6 +1 @@
-from ._client import \
-    Client, \
-    REST_HOST, \
-    WSS_HOST, \
-    PUB_REST_HOST, \
-    PUB_WSS_HOST
+from ._client import PUB_REST_HOST, PUB_WSS_HOST, REST_HOST, WSS_HOST, Client

bfxapi/_client.py

@@ -1,15 +1,12 @@
-from typing import \
-    TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, List, Optional
 
 from bfxapi._utils.logging import ColorLogger
-
+from bfxapi.exceptions import IncompleteCredentialError
 from bfxapi.rest import BfxRestInterface
 from bfxapi.websocket import BfxWebSocketClient
-from bfxapi.exceptions import IncompleteCredentialError
 
 if TYPE_CHECKING:
-    from bfxapi.websocket._client.bfx_websocket_client import \
-        _Credentials
+    from bfxapi.websocket._client.bfx_websocket_client import _Credentials
 
 REST_HOST = "https://api.bitfinex.com/v2"
 WSS_HOST = "wss://api.bitfinex.com/ws/2"

bfxapi/_utils/json_decoder.py

@@ -1,6 +1,7 @@
-from typing import Dict, Any
+import json
+import re
+from typing import Any, Dict
 
-import re, json
 
 def _to_snake_case(string: str) -> str:
     return re.sub(r"(?<!^)(?=[A-Z])", "_", string).lower()

bfxapi/_utils/json_encoder.py

@@ -1,10 +1,6 @@
-from typing import \
-    Union, List, Dict, \
-    Any
-
 import json
-
 from decimal import Decimal
+from typing import Any, Dict, List, Union
 
 _ExtJSON = Union[Dict[str, "_ExtJSON"], List["_ExtJSON"], \
     bool, int, float, str, Decimal, None]

bfxapi/_utils/logging.py

@@ -1,12 +1,9 @@
-from typing import \
-    TYPE_CHECKING, Literal, Optional
+import sys
+from copy import copy
 
 #pylint: disable-next=wildcard-import,unused-wildcard-import
 from logging import *
-
-from copy import copy
-
-import sys
+from typing import TYPE_CHECKING, Literal, Optional
 
 if TYPE_CHECKING:
     _Level = Literal["NOTSET", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]

bfxapi/rest/__init__.py

@@ -1,2 +1,6 @@
-from .endpoints import BfxRestInterface, RestPublicEndpoints, RestAuthEndpoints, \
-                    RestMerchantEndpoints
+from .endpoints import (
+    BfxRestInterface,
+    RestAuthEndpoints,
+    RestMerchantEndpoints,
+    RestPublicEndpoints,
+)

bfxapi/rest/endpoints/__init__.py

@@ -1,5 +1,4 @@
 from .bfx_rest_interface import BfxRestInterface
-
-from .rest_public_endpoints import RestPublicEndpoints
 from .rest_auth_endpoints import RestAuthEndpoints
 from .rest_merchant_endpoints import RestMerchantEndpoints
+from .rest_public_endpoints import RestPublicEndpoints

bfxapi/rest/endpoints/bfx_rest_interface.py

@@ -1,6 +1,7 @@
-from .rest_public_endpoints import RestPublicEndpoints
 from .rest_auth_endpoints import RestAuthEndpoints
 from .rest_merchant_endpoints import RestMerchantEndpoints
+from .rest_public_endpoints import RestPublicEndpoints
+
 
 class BfxRestInterface:
     VERSION = 2

bfxapi/rest/endpoints/rest_auth_endpoints.py

@@ -1,24 +1,43 @@
-from typing import Dict, List, Tuple, Union, Literal, Optional
-
 from decimal import Decimal
+from typing import Dict, List, Literal, Optional, Tuple, Union
 
+from ...types import (
+    BalanceAvailable,
+    BaseMarginInfo,
+    DepositAddress,
+    DerivativePositionCollateral,
+    DerivativePositionCollateralLimits,
+    FundingAutoRenew,
+    FundingCredit,
+    FundingInfo,
+    FundingLoan,
+    FundingOffer,
+    FundingTrade,
+    Ledger,
+    LightningNetworkInvoice,
+    LoginHistory,
+    Movement,
+    Notification,
+    Order,
+    OrderTrade,
+    Position,
+    PositionAudit,
+    PositionClaim,
+    PositionHistory,
+    PositionIncrease,
+    PositionIncreaseInfo,
+    PositionSnapshot,
+    SymbolMarginInfo,
+    Trade,
+    Transfer,
+    UserInfo,
+    Wallet,
+    Withdrawal,
+    serializers,
+)
+from ...types.serializers import _Notification
 from ..middleware import Middleware
 
-from ...types import Notification, \
-    UserInfo, LoginHistory, BalanceAvailable, \
-    Order, Position, Trade, \
-    FundingTrade, OrderTrade, Ledger, \
-    FundingOffer, FundingCredit, FundingLoan, \
-    FundingAutoRenew, FundingInfo, Wallet, \
-    Transfer, Withdrawal, DepositAddress, \
-    LightningNetworkInvoice, Movement, SymbolMarginInfo, \
-    BaseMarginInfo, PositionClaim, PositionIncreaseInfo, \
-    PositionIncrease, PositionHistory, PositionSnapshot, \
-    PositionAudit, DerivativePositionCollateral, DerivativePositionCollateralLimits
-
-from ...types import serializers
-
-from ...types.serializers import _Notification
 
 #pylint: disable-next=too-many-public-methods
 class RestAuthEndpoints(Middleware):

bfxapi/rest/endpoints/rest_merchant_endpoints.py

@@ -1,19 +1,15 @@
-from typing import \
-    TypedDict, Dict, List, \
-    Union, Literal, Optional, \
-    Any
-
 from decimal import Decimal
+from typing import Any, Dict, List, Literal, Optional, TypedDict, Union
 
 from bfxapi.rest.middleware import Middleware
-
-from bfxapi.types import \
-    InvoiceSubmission, \
-    InvoicePage, \
-    InvoiceStats, \
-    CurrencyConversion, \
-    MerchantDeposit, \
-    MerchantUnlinkedDeposit
+from bfxapi.types import (
+    CurrencyConversion,
+    InvoicePage,
+    InvoiceStats,
+    InvoiceSubmission,
+    MerchantDeposit,
+    MerchantUnlinkedDeposit,
+)
 
 _CustomerInfo = TypedDict("_CustomerInfo", {
     "nationality": str,

bfxapi/rest/endpoints/rest_public_endpoints.py

@@ -1,19 +1,32 @@
-from typing import List, Dict, Union, Literal, Optional, Any, cast
-
 from decimal import Decimal
+from typing import Any, Dict, List, Literal, Optional, Union, cast
 
+from ...types import (
+    Candle,
+    DerivativesStatus,
+    FundingCurrencyBook,
+    FundingCurrencyRawBook,
+    FundingCurrencyTicker,
+    FundingCurrencyTrade,
+    FundingMarketAveragePrice,
+    FundingStatistic,
+    FxRate,
+    Leaderboard,
+    Liquidation,
+    PlatformStatus,
+    PulseMessage,
+    PulseProfile,
+    Statistic,
+    TickersHistory,
+    TradingMarketAveragePrice,
+    TradingPairBook,
+    TradingPairRawBook,
+    TradingPairTicker,
+    TradingPairTrade,
+    serializers,
+)
 from ..middleware import Middleware
 
-from ...types import \
-    PlatformStatus, TradingPairTicker, FundingCurrencyTicker, \
-    TickersHistory, TradingPairTrade, FundingCurrencyTrade, \
-    TradingPairBook, FundingCurrencyBook, TradingPairRawBook, \
-    FundingCurrencyRawBook, Statistic, Candle, \
-    DerivativesStatus, Liquidation, Leaderboard, \
-    FundingStatistic, PulseProfile, PulseMessage, \
-    TradingMarketAveragePrice, FundingMarketAveragePrice, FxRate
-
-from ...types import serializers
 
 #pylint: disable-next=too-many-public-methods
 class RestPublicEndpoints(Middleware):

bfxapi/rest/exceptions.py

@@ -1,5 +1,6 @@
 from bfxapi.exceptions import BfxBaseException
 
+
 class NotFoundError(BfxBaseException):
     pass
 

bfxapi/rest/middleware/middleware.py

@@ -1,16 +1,17 @@
-from typing import TYPE_CHECKING, Optional, Any
-
+import hashlib
+import hmac
+import json
+import time
 from enum import IntEnum
-
 from http import HTTPStatus
+from typing import TYPE_CHECKING, Any, Optional
 
-import time, hmac, hashlib, json, requests
+import requests
 
-from ..exceptions import NotFoundError, RequestParametersError, UnknownGenericError
-
-from ...exceptions import InvalidCredentialError
-from ..._utils.json_encoder import JSONEncoder
 from ..._utils.json_decoder import JSONDecoder
+from ..._utils.json_encoder import JSONEncoder
+from ...exceptions import InvalidCredentialError
+from ..exceptions import NotFoundError, RequestParametersError, UnknownGenericError
 
 if TYPE_CHECKING:
     from requests.sessions import _Params

bfxapi/types/__init__.py

@@ -1,26 +1,60 @@
-from .dataclasses import \
-    PlatformStatus, TradingPairTicker, FundingCurrencyTicker, \
-    TickersHistory, TradingPairTrade, FundingCurrencyTrade, \
-    TradingPairBook, FundingCurrencyBook, TradingPairRawBook, \
-    FundingCurrencyRawBook, Statistic, Candle, \
-    DerivativesStatus, Liquidation, Leaderboard, \
-    FundingStatistic, PulseProfile, PulseMessage, \
-    TradingMarketAveragePrice, FundingMarketAveragePrice, FxRate
-
-from .dataclasses import \
-    UserInfo, LoginHistory, BalanceAvailable, \
-    Order, Position, Trade, \
-    FundingTrade, OrderTrade, Ledger, \
-    FundingOffer, FundingCredit, FundingLoan, \
-    FundingAutoRenew, FundingInfo, Wallet, \
-    Transfer, Withdrawal, DepositAddress, \
-    LightningNetworkInvoice, Movement, SymbolMarginInfo, \
-    BaseMarginInfo, PositionClaim, PositionIncreaseInfo, \
-    PositionIncrease, PositionHistory, PositionSnapshot, \
-    PositionAudit, DerivativePositionCollateral, DerivativePositionCollateralLimits
-
-from .dataclasses import \
-    InvoiceSubmission, InvoicePage, InvoiceStats, \
-    CurrencyConversion, MerchantDeposit, MerchantUnlinkedDeposit
-
+from .dataclasses import (
+    BalanceAvailable,
+    BaseMarginInfo,
+    Candle,
+    CurrencyConversion,
+    DepositAddress,
+    DerivativePositionCollateral,
+    DerivativePositionCollateralLimits,
+    DerivativesStatus,
+    FundingAutoRenew,
+    FundingCredit,
+    FundingCurrencyBook,
+    FundingCurrencyRawBook,
+    FundingCurrencyTicker,
+    FundingCurrencyTrade,
+    FundingInfo,
+    FundingLoan,
+    FundingMarketAveragePrice,
+    FundingOffer,
+    FundingStatistic,
+    FundingTrade,
+    FxRate,
+    InvoicePage,
+    InvoiceStats,
+    InvoiceSubmission,
+    Leaderboard,
+    Ledger,
+    LightningNetworkInvoice,
+    Liquidation,
+    LoginHistory,
+    MerchantDeposit,
+    MerchantUnlinkedDeposit,
+    Movement,
+    Order,
+    OrderTrade,
+    PlatformStatus,
+    Position,
+    PositionAudit,
+    PositionClaim,
+    PositionHistory,
+    PositionIncrease,
+    PositionIncreaseInfo,
+    PositionSnapshot,
+    PulseMessage,
+    PulseProfile,
+    Statistic,
+    SymbolMarginInfo,
+    TickersHistory,
+    Trade,
+    TradingMarketAveragePrice,
+    TradingPairBook,
+    TradingPairRawBook,
+    TradingPairTicker,
+    TradingPairTrade,
+    Transfer,
+    UserInfo,
+    Wallet,
+    Withdrawal,
+)
 from .notification import Notification

bfxapi/types/dataclasses.py

@@ -1,9 +1,7 @@
-from typing import \
-    List, Dict, Literal, Optional, Any
-
 from dataclasses import dataclass
+from typing import Any, Dict, List, Literal, Optional
 
-from .labeler import _Type, partial, compose
+from .labeler import _Type, compose, partial
 
 #region Dataclass definitions for types of public use
 

bfxapi/types/labeler.py

@@ -1,5 +1,4 @@
-from typing import Type, Generic, TypeVar, Iterable, \
-    Dict, List, Tuple, Any, cast
+from typing import Any, Dict, Generic, Iterable, List, Tuple, Type, TypeVar, cast
 
 T = TypeVar("T", bound="_Type")
 

bfxapi/types/notification.py

@@ -1,6 +1,7 @@
-from typing import List, Optional, Any, Generic, TypeVar, cast
 from dataclasses import dataclass
-from .labeler import _Type, _Serializer
+from typing import Any, Generic, List, Optional, TypeVar, cast
+
+from .labeler import _Serializer, _Type
 
 T = TypeVar("T")
 

bfxapi/types/serializers.py

@@ -1,8 +1,11 @@
-from .import dataclasses
+from . import dataclasses
 
 #pylint: disable-next=unused-import
-from .labeler import _Serializer, \
-    generate_labeler_serializer, generate_recursive_serializer
+from .labeler import (
+    _Serializer,
+    generate_labeler_serializer,
+    generate_recursive_serializer,
+)
 
 #pylint: disable-next=unused-import
 from .notification import _Notification

bfxapi/websocket/_client/bfx_websocket_bucket.py

@@ -1,16 +1,14 @@
-from typing import \
-    List, Dict, Any, \
-    Optional, cast
-
-import asyncio, json, uuid
+import asyncio
+import json
+import uuid
+from typing import Any, Dict, List, Optional, cast
 
 import websockets.client
-
 from pyee import EventEmitter
+
 from bfxapi._utils.json_decoder import JSONDecoder
 from bfxapi.websocket._connection import Connection
 from bfxapi.websocket._handlers import PublicChannelsHandler
-
 from bfxapi.websocket.subscriptions import Subscription
 
 _CHECKSUM_FLAG_VALUE = 131_072

bfxapi/websocket/_client/bfx_websocket_client.py

@@ -1,41 +1,31 @@
-from typing import \
-    TypedDict, List, Dict, \
-    Optional, Any
-
-from logging import Logger
-
-from datetime import datetime
-from socket import gaierror
+import asyncio
+import json
+import random
+import traceback
 from asyncio import Task
+from datetime import datetime
+from logging import Logger
+from socket import gaierror
+from typing import Any, Dict, List, Optional, TypedDict
 
-import \
-    traceback, json, asyncio, \
-    random, websockets
-
+import websockets
 import websockets.client
-
-from websockets.exceptions import \
-    ConnectionClosedError, \
-    InvalidStatusCode
+from websockets.exceptions import ConnectionClosedError, InvalidStatusCode
 
 from bfxapi._utils.json_encoder import JSONEncoder
-
+from bfxapi.exceptions import InvalidCredentialError
 from bfxapi.websocket._connection import Connection
-from bfxapi.websocket._handlers import AuthEventsHandler
 from bfxapi.websocket._event_emitter import BfxEventEmitter
-
-from bfxapi.exceptions import \
-    InvalidCredentialError
-
-from bfxapi.websocket.exceptions import \
-    ReconnectionTimeoutError, \
-    VersionMismatchError, \
-    UnknownChannelError, \
-    UnknownSubscriptionError, \
-    SubIdError
+from bfxapi.websocket._handlers import AuthEventsHandler
+from bfxapi.websocket.exceptions import (
+    ReconnectionTimeoutError,
+    SubIdError,
+    UnknownChannelError,
+    UnknownSubscriptionError,
+    VersionMismatchError,
+)
 
 from .bfx_websocket_bucket import BfxWebSocketBucket
-
 from .bfx_websocket_inputs import BfxWebSocketInputs
 
 _Credentials = TypedDict("_Credentials", \

bfxapi/websocket/_client/bfx_websocket_inputs.py

@@ -1,9 +1,5 @@
-from typing import \
-    Callable, Awaitable, Tuple, \
-    List, Union, Optional, \
-    Any
-
 from decimal import Decimal
+from typing import Any, Awaitable, Callable, List, Optional, Tuple, Union
 
 _Handler = Callable[[str, Any], Awaitable[None]]
 

bfxapi/websocket/_connection.py

@@ -1,25 +1,16 @@
-from typing import \
-    TypeVar, Callable, Awaitable, \
-    List, Dict, Optional, \
-    Any, cast
+import hashlib
+import hmac
+import json
+from abc import ABC, abstractmethod
+from datetime import datetime
+from functools import wraps
+from typing import Any, Awaitable, Callable, Dict, List, Optional, TypeVar, cast
 
 # pylint: disable-next=wrong-import-order
-from typing_extensions import \
-    ParamSpec, Concatenate
-
-from abc import \
-    ABC, abstractmethod
-
-from functools import wraps
-
-from datetime import datetime
-
-import hmac, hashlib, json
-
+from typing_extensions import Concatenate, ParamSpec
 from websockets.client import WebSocketClientProtocol
 
-from bfxapi.websocket.exceptions import \
-    ConnectionNotOpen, ActionRequiresAuthentication
+from bfxapi.websocket.exceptions import ActionRequiresAuthentication, ConnectionNotOpen
 
 _S = TypeVar("_S", bound="Connection")
 

bfxapi/websocket/_event_emitter/bfx_event_emitter.py

@@ -1,10 +1,7 @@
-from typing import \
-    TypeVar, Callable, List, \
-    Dict, Union, Optional, \
-    Any
-
-from collections import defaultdict
 from asyncio import AbstractEventLoop
+from collections import defaultdict
+from typing import Any, Callable, Dict, List, Optional, TypeVar, Union
+
 from pyee.asyncio import AsyncIOEventEmitter
 
 from bfxapi.websocket.exceptions import UnknownEventError

bfxapi/websocket/_handlers/__init__.py

@@ -1,3 +1,2 @@
-from .public_channels_handler import PublicChannelsHandler
-
 from .auth_events_handler import AuthEventsHandler
+from .public_channels_handler import PublicChannelsHandler

bfxapi/websocket/_handlers/auth_events_handler.py

@@ -1,14 +1,11 @@
-from typing import \
-    Dict, Tuple, Any
+from typing import Any, Dict, Tuple
 
 from pyee.base import EventEmitter
 
 from bfxapi.types import serializers
-
+from bfxapi.types.dataclasses import FundingOffer, Order
 from bfxapi.types.serializers import _Notification
 
-from bfxapi.types.dataclasses import \
-    Order, FundingOffer
 
 class AuthEventsHandler:
     __ABBREVIATIONS = {

bfxapi/websocket/_handlers/public_channels_handler.py

@@ -1,13 +1,16 @@
-from typing import \
-    List, Any, cast
+from typing import Any, List, cast
 
 from pyee.base import EventEmitter
 
 from bfxapi.types import serializers
-
-from bfxapi.websocket.subscriptions import \
-    Subscription, Ticker, Trades, \
-    Book, Candles, Status
+from bfxapi.websocket.subscriptions import (
+    Book,
+    Candles,
+    Status,
+    Subscription,
+    Ticker,
+    Trades,
+)
 
 _CHECKSUM = "cs"
 

bfxapi/websocket/exceptions.py

@@ -1,5 +1,6 @@
 from bfxapi.exceptions import BfxBaseException
 
+
 class ConnectionNotOpen(BfxBaseException):
     pass
 

bfxapi/websocket/subscriptions.py

@@ -1,5 +1,4 @@
-from typing import \
-    Union, Literal, TypedDict
+from typing import Literal, TypedDict, Union
 
 Subscription = Union["Ticker", "Trades", "Book", "Candles", "Status"]
 

pyproject.toml

@@ -0,0 +1,2 @@
+[tool.isort]
+profile = "black"