Compare commits
3 Commits
d1eec24ed5
...
8299c65818
| Author | SHA1 | Date |
|---|---|---|
|
|
8299c65818 | |
|
|
170c95da28 | |
|
|
e1cd3fd955 |
|
|
@ -501,7 +501,7 @@ async def update_ledger_from_api_trades(
|
|||
for fill in fills:
|
||||
con: Contract = fill.contract
|
||||
conid: str = con.conId
|
||||
pexch: str | None = con.primaryExchange
|
||||
pexch: str|None = con.primaryExchange or con.exchange
|
||||
|
||||
if not pexch:
|
||||
cons = await client.get_con(conid=conid)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ from bidict import bidict
|
|||
import trio
|
||||
import tractor
|
||||
from tractor.devx.pformat import ppfmt
|
||||
from tractor._exceptions import reg_err_types
|
||||
# from tractor._exceptions import reg_err_types
|
||||
|
||||
from piker.accounting import (
|
||||
Position,
|
||||
|
|
@ -97,13 +97,6 @@ MsgUnion = Union[
|
|||
]
|
||||
|
||||
|
||||
class TooFastEdit(Exception):
|
||||
'Edit requests faster then api submissions'
|
||||
|
||||
|
||||
reg_err_types([TooFastEdit])
|
||||
|
||||
|
||||
# TODO: make this wrap the `api.Client` and `ws` instances
|
||||
# and give it methods to submit cancel vs. add vs. edit
|
||||
# requests?
|
||||
|
|
@ -138,15 +131,16 @@ async def handle_order_requests(
|
|||
apiflows: OrderDialogs,
|
||||
ids: bidict[str, int],
|
||||
reqids2txids: dict[int, str],
|
||||
toofastedit: set[int],
|
||||
|
||||
) -> None:
|
||||
'''
|
||||
Process new order submission requests from the EMS
|
||||
and deliver acks or errors.
|
||||
`trio.Task` which handles order ctl requests from the EMS and
|
||||
deliver acks or errors back on that IPC dialog.
|
||||
|
||||
'''
|
||||
# XXX: UGH, let's unify this.. with ``msgspec``!!!
|
||||
msg: dict | Order
|
||||
msg: dict|Order
|
||||
async for msg in ems_order_stream:
|
||||
log.info(f'Rx order msg:\n{pformat(msg)}')
|
||||
match msg:
|
||||
|
|
@ -160,8 +154,13 @@ async def handle_order_requests(
|
|||
txid = reqids2txids[reqid]
|
||||
except KeyError:
|
||||
# XXX: not sure if this block ever gets hit now?
|
||||
# SEEMS TO on the race case with the update task?
|
||||
# - update dark order quickly after
|
||||
# triggered-submitted and then we have inavlid
|
||||
# value in `reqids2txids` sent over ws.send()??
|
||||
log.error('TOO FAST CANCEL/EDIT')
|
||||
reqids2txids[reqid] = TooFastEdit(reqid)
|
||||
toofastedit.add(reqid)
|
||||
reqids2txids[reqid] = reqid
|
||||
await ems_order_stream.send(
|
||||
BrokerdError(
|
||||
oid=msg['oid'],
|
||||
|
|
@ -199,13 +198,15 @@ async def handle_order_requests(
|
|||
|
||||
# XXX: not sure if this block ever gets hit now?
|
||||
log.error('TOO FAST EDIT')
|
||||
reqids2txids[reqid] = TooFastEdit(reqid)
|
||||
reqids2txids[reqid] = reqid
|
||||
toofastedit.add(reqid)
|
||||
await tractor.pause()
|
||||
await ems_order_stream.send(
|
||||
BrokerdError(
|
||||
oid=msg['oid'],
|
||||
symbol=msg['symbol'],
|
||||
reason=(
|
||||
f'TooFastEdit reqid:{reqid}, cancelling..'
|
||||
f'TooFastEdit reqid: {reqid}, cancelling..'
|
||||
),
|
||||
|
||||
)
|
||||
|
|
@ -328,11 +329,19 @@ async def subscribe(
|
|||
'''
|
||||
# more specific logic for this in kraken's sync client:
|
||||
# https://github.com/krakenfx/kraken-wsclient-py/blob/master/kraken_wsclient_py/kraken_wsclient_py.py#L188
|
||||
assert (
|
||||
latest_token: str = await client.get_ws_token()
|
||||
if (
|
||||
token
|
||||
and
|
||||
token == await client.get_ws_token()
|
||||
)
|
||||
!=
|
||||
latest_token
|
||||
):
|
||||
log.info(
|
||||
f'RE-subscribing to WS connection..\n'
|
||||
f'orig-token: {token!r}\n'
|
||||
f'latest-token: {latest_token!r}\n'
|
||||
)
|
||||
token = latest_token
|
||||
|
||||
subnames: set[str] = set()
|
||||
|
||||
for name, sub_opts in subs:
|
||||
|
|
@ -340,7 +349,8 @@ async def subscribe(
|
|||
'event': 'subscribe',
|
||||
'subscription': {
|
||||
'name': name,
|
||||
'token': await client.get_ws_token(),
|
||||
# 'token': await client.get_ws_token(),
|
||||
'token': latest_token,
|
||||
**sub_opts,
|
||||
}
|
||||
}
|
||||
|
|
@ -665,6 +675,10 @@ async def open_trade_dialog(
|
|||
|
||||
token: str = await client.get_ws_token()
|
||||
|
||||
# XXX tracks EMS orders which are updated too quickly
|
||||
# on the emds side with sync-issues on the kraken side.
|
||||
toofastedit: set[int] = set()
|
||||
|
||||
ws: NoBsWs
|
||||
async with (
|
||||
ctx.open_stream() as ems_stream,
|
||||
|
|
@ -680,15 +694,16 @@ async def open_trade_dialog(
|
|||
trio.open_nursery() as tn,
|
||||
):
|
||||
# task for processing inbound requests from ems
|
||||
tn.start_soon(
|
||||
tn.start_soon(partial(
|
||||
handle_order_requests,
|
||||
ws,
|
||||
client,
|
||||
ems_stream,
|
||||
apiflows,
|
||||
ids,
|
||||
reqids2txids,
|
||||
)
|
||||
ws=ws,
|
||||
client=client,
|
||||
ems_order_stream=ems_stream,
|
||||
apiflows=apiflows,
|
||||
ids=ids,
|
||||
reqids2txids=reqids2txids,
|
||||
toofastedit=toofastedit,
|
||||
))
|
||||
|
||||
# enter relay loop
|
||||
await handle_order_updates(
|
||||
|
|
@ -699,6 +714,7 @@ async def open_trade_dialog(
|
|||
apiflows=apiflows,
|
||||
ids=ids,
|
||||
reqids2txids=reqids2txids,
|
||||
toofastedit=toofastedit,
|
||||
acnt=acnt,
|
||||
ledger=ledger,
|
||||
acctid=acctid,
|
||||
|
|
@ -714,6 +730,7 @@ async def handle_order_updates(
|
|||
apiflows: OrderDialogs,
|
||||
ids: bidict[str, int],
|
||||
reqids2txids: bidict[int, str],
|
||||
toofastedit: set[int],
|
||||
acnt: Account,
|
||||
|
||||
# transaction records which will be updated
|
||||
|
|
@ -851,7 +868,7 @@ async def handle_order_updates(
|
|||
for order_msg in order_msgs:
|
||||
log.info(
|
||||
f'`openOrders` msg update_{seq}:\n'
|
||||
f'{pformat(order_msg)}'
|
||||
f'{ppfmt(order_msg)}'
|
||||
)
|
||||
txid, update_msg = list(order_msg.items())[0]
|
||||
|
||||
|
|
@ -1021,10 +1038,8 @@ async def handle_order_updates(
|
|||
# <-> ems dialog.
|
||||
if (
|
||||
status == 'open'
|
||||
and isinstance(
|
||||
reqids2txids.get(reqid),
|
||||
TooFastEdit
|
||||
)
|
||||
and
|
||||
reqid in toofastedit
|
||||
):
|
||||
# TODO: don't even allow this case
|
||||
# by not moving the client side line
|
||||
|
|
@ -1186,7 +1201,8 @@ async def handle_order_updates(
|
|||
txid
|
||||
|
||||
# we throttle too-fast-requests on the ems side
|
||||
and not isinstance(txid, TooFastEdit)
|
||||
and
|
||||
reqid in toofastedit
|
||||
):
|
||||
# client was editting too quickly
|
||||
# so we instead cancel this order
|
||||
|
|
|
|||
Loading…
Reference in New Issue