Reformat with ufmt again

Sorts headers, does other things.

Author: mattsta

ib_async/__init__.py

@@ -31,17 +31,17 @@
     Warrant,
 )
 from .flexreport import FlexError, FlexReport
-from .ib import IB, StartupFetch, StartupFetchNONE, StartupFetchALL
+from .ib import IB, StartupFetch, StartupFetchALL, StartupFetchNONE
 from .ibcontroller import IBC, Watchdog
 from .objects import (
     AccountValue,
     BarData,
     BarDataList,
     CommissionReport,
     ConnectionStats,
-    DOMLevel,
     DepthMktDataDescription,
     Dividends,
+    DOMLevel,
     Execution,
     ExecutionFilter,
     FamilyCode,

ib_async/client.py

@@ -7,15 +7,15 @@
 import struct
 import time
 from collections import deque
-from typing import Deque, List, Optional, Callable, Any
+from typing import Any, Callable, Deque, List, Optional
 
 from eventkit import Event
 
 from .connection import Connection
 from .contract import Contract
 from .decoder import Decoder
 from .objects import ConnectionStats, WshEventData
-from .util import UNSET_DOUBLE, UNSET_INTEGER, dataclassAsTuple, getLoop, run
+from .util import dataclassAsTuple, getLoop, run, UNSET_DOUBLE, UNSET_INTEGER
 
 
 class Client:

ib_async/decoder.py

@@ -32,7 +32,7 @@
     TickAttribLast,
 )
 from .order import Order, OrderComboLeg, OrderCondition, OrderState
-from .util import UNSET_DOUBLE, ZoneInfo, parseIBDatetime
+from .util import parseIBDatetime, UNSET_DOUBLE, ZoneInfo
 from .wrapper import Wrapper
 
 
@@ -152,13 +152,19 @@ def handler(fields):
             if method:
                 try:
                     args = [
-                        field
-                        if typ is str
-                        else int(field or 0)
-                        if typ is int
-                        else float(field or 0)
-                        if typ is float
-                        else bool(int(field or 0))
+                        (
+                            field
+                            if typ is str
+                            else (
+                                int(field or 0)
+                                if typ is int
+                                else (
+                                    float(field or 0)
+                                    if typ is float
+                                    else bool(int(field or 0))
+                                )
+                            )
+                        )
                         for (typ, field) in zip(types, fields[skip:])
                     ]
                     method(*args)

ib_async/ib.py

@@ -5,10 +5,10 @@
 import datetime
 import logging
 import time
+from enum import auto, Flag
 from typing import Any, Awaitable, Dict, Iterator, List, Optional, Union
 
 from eventkit import Event
-from enum import Flag, auto
 
 import ib_async.util as util
 from ib_async.client import Client

ib_async/ibcontroller.py

@@ -144,9 +144,11 @@ async def startAsync(self):
 
         # create shell command
         cmd = [
-            f"{self.ibcPath}\\scripts\\StartIBC.bat"
-            if self._isWindows
-            else f"{self.ibcPath}/scripts/ibcstart.sh"
+            (
+                f"{self.ibcPath}\\scripts\\StartIBC.bat"
+                if self._isWindows
+                else f"{self.ibcPath}/scripts/ibcstart.sh"
+            )
         ]
         for k, v in util.dataclassAsDict(self).items():
             arg = args[k][self._isWindows]

ib_async/order.py

@@ -12,7 +12,7 @@
 
 from .contract import Contract, TagValue
 from .objects import Fill, SoftDollarTier, TradeLogEntry
-from .util import UNSET_DOUBLE, UNSET_INTEGER, dataclassNonDefaults
+from .util import dataclassNonDefaults, UNSET_DOUBLE, UNSET_INTEGER
 
 
 @dataclass

ib_async/ticker.py

@@ -8,8 +8,8 @@
 
 from ib_async.contract import Contract
 from ib_async.objects import (
-    DOMLevel,
     Dividends,
+    DOMLevel,
     FundamentalRatios,
     IBDefaults,
     MktDepthData,

ib_async/wrapper.py

@@ -10,16 +10,16 @@
 from datetime import datetime, timezone
 from typing import (
     Any,
+    cast,
     Dict,
+    Final,
     List,
     Optional,
     Set,
-    TYPE_CHECKING,
     Tuple,
-    Union,
-    cast,
-    Final,
+    TYPE_CHECKING,
     TypeAlias,
+    Union,
 )
 
 from ib_async.contract import (
@@ -34,9 +34,9 @@
     BarData,
     BarDataList,
     CommissionReport,
-    DOMLevel,
     DepthMktDataDescription,
     Dividends,
+    DOMLevel,
     Execution,
     FamilyCode,
     Fill,
@@ -75,13 +75,13 @@
 from ib_async.order import Order, OrderState, OrderStatus, Trade
 from ib_async.ticker import Ticker
 from ib_async.util import (
-    UNSET_DOUBLE,
-    UNSET_INTEGER,
     dataclassAsDict,
     dataclassUpdate,
     getLoop,
     globalErrorEvent,
     parseIBDatetime,
+    UNSET_DOUBLE,
+    UNSET_INTEGER,
 )
 
 if TYPE_CHECKING:
@@ -1131,9 +1131,7 @@ def tickString(self, reqId: int, tickType: int, value: str):
             elif tickType == 47:
                 # https://web.archive.org/web/20200725010343/https://interactivebrokers.github.io/tws-api/fundamental_ratios_tags.html
                 d = dict(
-                    t.split("=")  # type: ignore
-                    for t in value.split(";")
-                    if t
+                    t.split("=") for t in value.split(";") if t  # type: ignore
                 )  # type: ignore
                 for k, v in d.items():
                     with suppress(ValueError):