Skip to content

Commit 74106cd

Browse files
authored
Merge pull request #183 from AsyncAlgoTrading/tkp/typefix
upgrade deps in GitHub workflow
2 parents efe593a + 0ed7b96 commit 74106cd

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
- name: Install dependencies
5252
run: |
53-
python -m pip install --upgrade pip setuptools wheel twine numpy pyarrow>=1. cpplint pyEX tqdm
53+
python -m pip install -U cpplint numpy pip pyarrow pyEX setuptools tqdm twine wheel
5454
python -m pip install -e .[dev]
5555
cd js; yarn
5656

aat/engine/engine.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,36 +62,36 @@
6262
class TradingEngine(Application):
6363
"""A configureable trading application"""
6464

65-
name = "AAT"
66-
description = "async algorithmic trading engine"
65+
name = "AAT" # type: ignore
66+
description = "async algorithmic trading engine" # type: ignore
6767

6868
# Configureable parameters
69-
verbose = Bool(default_value=True)
70-
api = Bool(default_value=False)
71-
port = Unicode(default_value="8080", help="Port to run on").tag(config=True)
72-
event_loop = Instance(klass=asyncio.events.AbstractEventLoop)
73-
executor = Instance(klass=ThreadPoolExecutor, args=(4,), kwargs={})
69+
verbose = Bool(default_value=True) # type: ignore
70+
api = Bool(default_value=False) # type: ignore
71+
port = Unicode(default_value="8080", help="Port to run on").tag(config=True) # type: ignore
72+
event_loop = Instance(klass=asyncio.events.AbstractEventLoop) # type: ignore
73+
executor = Instance(klass=ThreadPoolExecutor, args=(4,), kwargs={}) # type: ignore
7474

7575
# Core components
76-
trading_type = Instance(klass=TradingType, default_value=TradingType.SIMULATION)
77-
order_manager = Instance(OrderManager, args=(), kwargs={})
78-
risk_manager = Instance(RiskManager, args=(), kwargs={})
79-
portfolio_manager = Instance(PortfolioManager, args=(), kwargs={})
80-
exchanges = List(trait=Instance(klass=Exchange))
81-
event_handlers = List(trait=Instance(EventHandler), default_value=[])
82-
strategies = List(trait=Instance(Strategy), default_value=[])
76+
trading_type = Instance(klass=TradingType, default_value=TradingType.SIMULATION) # type: ignore
77+
order_manager = Instance(OrderManager, args=(), kwargs={}) # type: ignore
78+
risk_manager = Instance(RiskManager, args=(), kwargs={}) # type: ignore
79+
portfolio_manager = Instance(PortfolioManager, args=(), kwargs={}) # type: ignore
80+
exchanges = List(trait=Instance(klass=Exchange)) # type: ignore
81+
event_handlers = List(trait=Instance(EventHandler), default_value=[]) # type: ignore
82+
strategies = List(trait=Instance(Strategy), default_value=[]) # type: ignore
8383

8484
# API application
85-
api_application = Instance(klass=TornadoApplication)
86-
api_handlers = List(default_value=[])
85+
api_application = Instance(klass=TornadoApplication) # type: ignore
86+
api_handlers = List(default_value=[]) # type: ignore
8787

88-
table_manager = Instance(
88+
table_manager = Instance( # type: ignore
8989
klass=PerspectiveManager or object, args=(), kwargs={}
9090
) # failover to object
9191

9292
aliases = {"port": "AAT.port", "trading_type": "AAT.trading_type"}
9393

94-
@validate("trading_type")
94+
@validate("trading_type") # type: ignore
9595
def _validate_trading_type(self, proposal: dict) -> TradingType:
9696
if proposal["value"] not in (
9797
TradingType.LIVE,
@@ -102,7 +102,7 @@ def _validate_trading_type(self, proposal: dict) -> TradingType:
102102
raise TraitError(f'Invalid trading type: {proposal["value"]}')
103103
return proposal["value"]
104104

105-
@validate("exchanges")
105+
@validate("exchanges") # type: ignore
106106
def _validate_exchanges(self, proposal: dict) -> ListType[Exchange]:
107107
for exch in proposal["value"]:
108108
if not isinstance(exch, Exchange):
@@ -148,7 +148,7 @@ def __init__(self, **config: dict) -> None:
148148

149149
# setup subscriptions
150150
self._handler_subscriptions: Dict[EventType, List] = {
151-
m: [] for m in EventType.__members__.values()
151+
m: [] for m in EventType.__members__.values() # type: ignore
152152
}
153153

154154
# setup `now` handler for backtest
@@ -311,10 +311,10 @@ def registerCallback(
311311
Returns:
312312
value (bool): True if registered (new), else False
313313
"""
314-
if (callback, handler) not in self._handler_subscriptions[event_type]:
314+
if (callback, handler) not in self._handler_subscriptions[event_type]: # type: ignore
315315
if not asyncio.iscoroutinefunction(callback):
316316
callback = self._make_async(callback)
317-
self._handler_subscriptions[event_type].append((callback, handler))
317+
self._handler_subscriptions[event_type].append((callback, handler)) # type: ignore
318318
return True
319319
return False
320320

@@ -449,7 +449,7 @@ async def processEvent(self, event: Event, strategy: Strategy = None) -> None:
449449
# ignore heartbeat
450450
return
451451

452-
for callback, handler in self._handler_subscriptions[event.type]:
452+
for callback, handler in self._handler_subscriptions[event.type]: # type: ignore
453453
# TODO make cleaner? move to somewhere not in critical path?
454454
if strategy is not None and (handler not in (strategy, self.manager)):
455455
continue

aat/exchange/synthetic/server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import asyncio
22
import os
3-
import websockets # type: ignore
43
import ujson # type: ignore
54
import uvloop # type: ignore
5+
from websockets import serve # type: ignore
66
from aat.exchange.synthetic import SyntheticExchange
77
from aat.core import Order
88
from aat.config import TradingType
@@ -31,7 +31,7 @@ async def handle(websocket, *args, **kwargs): # type: ignore
3131
except asyncio.TimeoutError:
3232
pass
3333

34-
start_server = websockets.serve(handle, "0.0.0.0", port)
34+
start_server = serve(handle, "0.0.0.0", port)
3535
print("listening on %d" % port)
3636
return start_server
3737

0 commit comments

Comments
 (0)