Compare commits
8 Commits
c210c286a5
...
887e1ea6b7
| Author | SHA1 | Date |
|---|---|---|
|
|
887e1ea6b7 | |
|
|
54da297304 | |
|
|
9f7c38a37b | |
|
|
8299c65818 | |
|
|
170c95da28 | |
|
|
e1cd3fd955 | |
|
|
8cefc1bdf8 | |
|
|
709269fcf7 |
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ import hashlib
|
|||
import hmac
|
||||
import base64
|
||||
import tractor
|
||||
from tractor._exceptions import reg_err_types
|
||||
# from tractor._exceptions import reg_err_types
|
||||
import trio
|
||||
|
||||
from piker import config
|
||||
|
|
@ -109,37 +109,37 @@ def get_kraken_signature(
|
|||
return sigdigest.decode()
|
||||
|
||||
|
||||
class InvalidKey(ValueError):
|
||||
'''
|
||||
EAPI:Invalid key
|
||||
# class InvalidKey(ValueError):
|
||||
# '''
|
||||
# EAPI:Invalid key
|
||||
|
||||
This error is returned when the API key used for the call is
|
||||
either expired or disabled, please review the API key in your
|
||||
Settings -> API tab of account management or generate a new one
|
||||
and update your application.
|
||||
# This error is returned when the API key used for the call is
|
||||
# either expired or disabled, please review the API key in your
|
||||
# Settings -> API tab of account management or generate a new one
|
||||
# and update your application.
|
||||
|
||||
'''
|
||||
# '''
|
||||
|
||||
|
||||
class InvalidSession(RuntimeError):
|
||||
'''
|
||||
ESession:Invalid session
|
||||
# class InvalidSession(RuntimeError):
|
||||
# '''
|
||||
# ESession:Invalid session
|
||||
|
||||
This error is returned when the ws API key used for an authenticated
|
||||
sub/endpoint becomes stale, normally after a sufficient network
|
||||
disconnect/outage.
|
||||
# This error is returned when the ws API key used for an authenticated
|
||||
# sub/endpoint becomes stale, normally after a sufficient network
|
||||
# disconnect/outage.
|
||||
|
||||
Normally the sub will need to be restarted, likely re-init of the
|
||||
auth handshake sequence.
|
||||
# Normally the sub will need to be restarted, likely re-init of the
|
||||
# auth handshake sequence.
|
||||
|
||||
'''
|
||||
subscription: dict
|
||||
# '''
|
||||
# subscription: dict
|
||||
|
||||
|
||||
reg_err_types([
|
||||
InvalidKey,
|
||||
InvalidSession,
|
||||
])
|
||||
# reg_err_types([
|
||||
# InvalidKey,
|
||||
# InvalidSession,
|
||||
# ])
|
||||
|
||||
|
||||
class Client:
|
||||
|
|
@ -176,6 +176,7 @@ class Client:
|
|||
self._api_key = api_key
|
||||
self._secret = secret
|
||||
self.conf: dict[str, str] = config
|
||||
self._ws_token: str|None = None
|
||||
|
||||
@property
|
||||
def pairs(self) -> dict[str, Pair]:
|
||||
|
|
@ -263,13 +264,22 @@ class Client:
|
|||
async def get_ws_token(
|
||||
self,
|
||||
params: dict = {},
|
||||
force_renewal: bool = False,
|
||||
) -> str:
|
||||
'''
|
||||
Get websocket token for authenticated data stream.
|
||||
Get websocket token for authenticated data stream and cache
|
||||
it for reuse.
|
||||
|
||||
Assert a value was actually received before return.
|
||||
|
||||
'''
|
||||
if (
|
||||
not force_renewal
|
||||
and
|
||||
self._ws_token
|
||||
):
|
||||
return self._ws_token
|
||||
|
||||
resp = await self.endpoint(
|
||||
'GetWebSocketsToken',
|
||||
{},
|
||||
|
|
@ -280,6 +290,8 @@ class Client:
|
|||
# resp token for ws init
|
||||
token: str = resp['result']['token']
|
||||
assert token
|
||||
|
||||
self._ws_token: str = token
|
||||
return token
|
||||
|
||||
async def get_assets(
|
||||
|
|
|
|||
|
|
@ -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?
|
||||
|
|
@ -135,19 +128,19 @@ async def handle_order_requests(
|
|||
ws: NoBsWs,
|
||||
client: api.Client,
|
||||
ems_order_stream: tractor.MsgStream,
|
||||
token: str,
|
||||
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:
|
||||
|
|
@ -161,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'],
|
||||
|
|
@ -178,7 +176,7 @@ async def handle_order_requests(
|
|||
# https://docs.kraken.com/websockets/#message-cancelOrder
|
||||
await ws.send_msg({
|
||||
'event': 'cancelOrder',
|
||||
'token': token,
|
||||
'token': await client.get_ws_token(),
|
||||
'reqid': reqid,
|
||||
'txid': [txid], # should be txid from submission
|
||||
})
|
||||
|
|
@ -200,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..'
|
||||
),
|
||||
|
||||
)
|
||||
|
|
@ -252,7 +252,7 @@ async def handle_order_requests(
|
|||
# https://docs.kraken.com/websockets/#message-addOrder
|
||||
req = {
|
||||
'event': ep,
|
||||
'token': token,
|
||||
'token': await client.get_ws_token(),
|
||||
|
||||
'reqid': reqid, # remapped-to-int uid from ems
|
||||
# XXX: we set these to the same value since for us
|
||||
|
|
@ -296,7 +296,8 @@ async def handle_order_requests(
|
|||
symbol=msg['symbol'],
|
||||
reason=(
|
||||
'Invalid request msg:\n{msg}'
|
||||
))
|
||||
),
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -328,7 +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 token
|
||||
latest_token: str = await client.get_ws_token()
|
||||
if (
|
||||
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:
|
||||
|
|
@ -336,7 +349,8 @@ async def subscribe(
|
|||
'event': 'subscribe',
|
||||
'subscription': {
|
||||
'name': name,
|
||||
'token': token,
|
||||
# 'token': await client.get_ws_token(),
|
||||
'token': latest_token,
|
||||
**sub_opts,
|
||||
}
|
||||
}
|
||||
|
|
@ -351,7 +365,9 @@ async def subscribe(
|
|||
# wait on subscriptionn acks
|
||||
with trio.move_on_after(5):
|
||||
while True:
|
||||
match (msg := await ws.recv_msg()):
|
||||
msg: dict = await ws.recv_msg()
|
||||
fmt_msg: str = ppfmt(msg)
|
||||
match msg:
|
||||
case {
|
||||
'event': 'subscriptionStatus',
|
||||
'status': 'subscribed',
|
||||
|
|
@ -382,23 +398,36 @@ async def subscribe(
|
|||
exc = etype(
|
||||
f'{ev_msg}\n'
|
||||
f'\n'
|
||||
f'{ppfmt(msg)}'
|
||||
f'{fmt_msg}'
|
||||
)
|
||||
# !TODO, for `InvalidSession` we should
|
||||
# attempt retries to resub and ensure all
|
||||
# sibling (task) `token` holders update
|
||||
# their refs accoridingly!
|
||||
if isinstance(exc, api.InvalidSession):
|
||||
match (etype_str, ev_msg):
|
||||
case (
|
||||
'ESession',
|
||||
'Invalid session',
|
||||
):
|
||||
# attempt ws-token refresh
|
||||
token: str = await client.get_ws_token()
|
||||
token: str = await client.get_ws_token(
|
||||
force_renewal=True
|
||||
)
|
||||
await tractor.pause()
|
||||
continue
|
||||
|
||||
case _:
|
||||
log.warning(
|
||||
f'Unhandled subscription-status,\n'
|
||||
f'{fmt_msg}'
|
||||
)
|
||||
|
||||
raise exc
|
||||
|
||||
case _:
|
||||
log.warning(
|
||||
f'Unknown ws event rxed?\n'
|
||||
f'{ppfmt(msg)}'
|
||||
f'{fmt_msg}'
|
||||
)
|
||||
yield
|
||||
|
||||
|
|
@ -646,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,
|
||||
|
|
@ -661,16 +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,
|
||||
token,
|
||||
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(
|
||||
|
|
@ -681,11 +714,11 @@ async def open_trade_dialog(
|
|||
apiflows=apiflows,
|
||||
ids=ids,
|
||||
reqids2txids=reqids2txids,
|
||||
toofastedit=toofastedit,
|
||||
acnt=acnt,
|
||||
ledger=ledger,
|
||||
acctid=acctid,
|
||||
acc_name=fqan,
|
||||
token=token,
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -697,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
|
||||
|
|
@ -705,7 +739,6 @@ async def handle_order_updates(
|
|||
# ledger_trans: dict[str, Transaction],
|
||||
acctid: str,
|
||||
acc_name: str,
|
||||
token: str,
|
||||
|
||||
) -> None:
|
||||
'''
|
||||
|
|
@ -835,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]
|
||||
|
||||
|
|
@ -1005,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
|
||||
|
|
@ -1023,7 +1054,8 @@ async def handle_order_updates(
|
|||
# https://docs.kraken.com/websockets/#message-cancelOrder
|
||||
await ws.send_msg({
|
||||
'event': 'cancelOrder',
|
||||
'token': token,
|
||||
# 'token': token,
|
||||
'token': await client.get_ws_token(),
|
||||
'reqid': reqid or 0,
|
||||
'txid': [txid],
|
||||
})
|
||||
|
|
@ -1169,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
|
||||
|
|
@ -1177,7 +1210,8 @@ async def handle_order_updates(
|
|||
f'Cancelling {reqid}@{txid} due to:\n {event}')
|
||||
await ws.send_msg({
|
||||
'event': 'cancelOrder',
|
||||
'token': token,
|
||||
# 'token': token,
|
||||
'token': await client.get_ws_token(),
|
||||
'reqid': reqid or 0,
|
||||
'txid': [txid],
|
||||
})
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ from collections import (
|
|||
from contextlib import asynccontextmanager as acm
|
||||
from decimal import Decimal
|
||||
from math import isnan
|
||||
from pprint import pformat
|
||||
from time import time_ns
|
||||
from types import ModuleType
|
||||
from typing import (
|
||||
|
|
@ -43,6 +42,7 @@ import trio
|
|||
from trio_typing import TaskStatus
|
||||
import tractor
|
||||
from tractor import trionics
|
||||
from tractor.devx.pformat import ppfmt
|
||||
|
||||
from ._util import (
|
||||
log, # sub-sys logger
|
||||
|
|
@ -490,7 +490,7 @@ async def open_brokerd_dialog(
|
|||
msg = BrokerdPosition(**msg)
|
||||
log.info(
|
||||
f'loading pp for {brokermod.__name__}:\n'
|
||||
f'{pformat(msg.to_dict())}',
|
||||
f'{ppfmt(msg.to_dict())}',
|
||||
)
|
||||
|
||||
# TODO: state any mismatch here?
|
||||
|
|
@ -840,7 +840,7 @@ async def translate_and_relay_brokerd_events(
|
|||
|
||||
brokerd_msg: dict[str, Any]
|
||||
async for brokerd_msg in brokerd_trades_stream:
|
||||
fmsg = pformat(brokerd_msg)
|
||||
fmsg = ppfmt(brokerd_msg)
|
||||
log.info(
|
||||
f'Rx brokerd trade msg:\n'
|
||||
f'{fmsg}'
|
||||
|
|
@ -1039,6 +1039,7 @@ async def translate_and_relay_brokerd_events(
|
|||
)
|
||||
|
||||
status_msg.reqid = reqid # THIS LINE IS CRITICAL!
|
||||
if not status_msg.brokerd_msg:
|
||||
status_msg.brokerd_msg = msg
|
||||
status_msg.src = msg.broker_details['name']
|
||||
|
||||
|
|
@ -1072,7 +1073,7 @@ async def translate_and_relay_brokerd_events(
|
|||
else: # open
|
||||
# relayed from backend but probably not handled so
|
||||
# just log it
|
||||
log.info(f'{broker} opened order {msg}')
|
||||
log.info(f'{broker!r} opened order {msg}')
|
||||
|
||||
# BrokerdFill
|
||||
case {
|
||||
|
|
@ -1185,7 +1186,7 @@ async def translate_and_relay_brokerd_events(
|
|||
}:
|
||||
msg = (
|
||||
f'Unhandled broker status for dialog {reqid}:\n'
|
||||
f'{pformat(brokerd_msg)}'
|
||||
f'{ppfmt(brokerd_msg)}'
|
||||
)
|
||||
if (
|
||||
oid := book._ems2brokerd_ids.inverse.get(reqid)
|
||||
|
|
@ -1194,7 +1195,7 @@ async def translate_and_relay_brokerd_events(
|
|||
# clearable limits..
|
||||
if status_msg := book._active.get(oid):
|
||||
msg += (
|
||||
f'last status msg: {pformat(status_msg)}\n\n'
|
||||
f'last status msg: {ppfmt(status_msg)}\n\n'
|
||||
f'this msg:{fmsg}\n'
|
||||
)
|
||||
|
||||
|
|
@ -1233,7 +1234,7 @@ async def process_client_order_cmds(
|
|||
async for cmd in client_order_stream:
|
||||
log.info(
|
||||
f'Received order cmd:\n'
|
||||
f'{pformat(cmd)}\n'
|
||||
f'{ppfmt(cmd)}\n'
|
||||
)
|
||||
|
||||
# CAWT DAMN we need struct support!
|
||||
|
|
@ -1398,8 +1399,8 @@ async def process_client_order_cmds(
|
|||
# handle relaying the ems side responses back to
|
||||
# the client/cmd sender from this request
|
||||
log.info(
|
||||
f'Sending live order to {broker}:\n'
|
||||
f'{pformat(msg)}'
|
||||
f'Sending live order to {broker!r}:\n'
|
||||
f'{ppfmt(msg)}'
|
||||
)
|
||||
|
||||
await brokerd_order_stream.send(msg)
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ async def _reconnect_forever(
|
|||
nobsws: NoBsWs,
|
||||
reset_after: int, # msg recv timeout before reset attempt
|
||||
|
||||
fixture: AsyncContextManager | None = None,
|
||||
fixture: AsyncContextManager|None = None,
|
||||
task_status: TaskStatus = trio.TASK_STATUS_IGNORED,
|
||||
|
||||
) -> None:
|
||||
|
|
@ -185,7 +185,7 @@ async def _reconnect_forever(
|
|||
async def proxy_msgs(
|
||||
ws: WebSocketConnection,
|
||||
rent_cs: trio.CancelScope, # parent cancel scope
|
||||
):
|
||||
) -> None:
|
||||
'''
|
||||
Receive (under `timeout` deadline) all msgs from from underlying
|
||||
websocket and relay them to (calling) parent task via ``trio``
|
||||
|
|
@ -206,7 +206,7 @@ async def _reconnect_forever(
|
|||
except nobsws.recon_errors:
|
||||
log.exception(
|
||||
f'{src_mod}\n'
|
||||
f'{url} connection bail with:'
|
||||
f'{url!r} connection failed\n'
|
||||
)
|
||||
with trio.CancelScope(shield=True):
|
||||
await trio.sleep(0.5)
|
||||
|
|
@ -269,7 +269,7 @@ async def _reconnect_forever(
|
|||
nobsws._ws = ws
|
||||
log.info(
|
||||
f'{src_mod}\n'
|
||||
f'Connection success: {url}'
|
||||
f'Connection success: {url!r}'
|
||||
)
|
||||
|
||||
# begin relay loop to forward msgs
|
||||
|
|
@ -341,7 +341,7 @@ async def _reconnect_forever(
|
|||
async def open_autorecon_ws(
|
||||
url: str,
|
||||
|
||||
fixture: AsyncContextManager | None = None,
|
||||
fixture: AsyncContextManager|None = None,
|
||||
|
||||
# time in sec between msgs received before
|
||||
# we presume connection might need a reset.
|
||||
|
|
@ -361,7 +361,7 @@ async def open_autorecon_ws(
|
|||
and restarts the full http(s) handshake on catches of certain
|
||||
connetivity errors, or some user defined recv timeout.
|
||||
|
||||
You can provide a ``fixture`` async-context-manager which will be
|
||||
You can provide a `fixture` async-context-manager which will be
|
||||
entered/exitted around each connection reset; eg. for
|
||||
(re)requesting subscriptions without requiring streaming setup
|
||||
code to rerun.
|
||||
|
|
@ -402,7 +402,8 @@ async def open_autorecon_ws(
|
|||
except NoBsWs.recon_errors as con_err:
|
||||
log.warning(
|
||||
f'Entire ws-channel disconnect due to,\n'
|
||||
f'con_err: {con_err!r}\n'
|
||||
f'\n'
|
||||
f'{con_err!r}\n'
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -424,7 +425,7 @@ class JSONRPCResult(Struct):
|
|||
async def open_jsonrpc_session(
|
||||
url: str,
|
||||
start_id: int = 0,
|
||||
response_type: type = JSONRPCResult,
|
||||
response_type: Type[Struct] = JSONRPCResult,
|
||||
msg_recv_timeout: float = float('inf'),
|
||||
# ^NOTE, since only `deribit` is using this jsonrpc stuff atm
|
||||
# and options mkts are generally "slow moving"..
|
||||
|
|
@ -435,7 +436,10 @@ async def open_jsonrpc_session(
|
|||
# broken and never restored with wtv init sequence is required to
|
||||
# re-establish a working req-resp session.
|
||||
|
||||
) -> Callable[[str, dict], dict]:
|
||||
) -> Callable[
|
||||
[str, dict],
|
||||
dict,
|
||||
]:
|
||||
'''
|
||||
Init a json-RPC-over-websocket connection to the provided `url`.
|
||||
|
||||
|
|
@ -531,14 +535,18 @@ async def open_jsonrpc_session(
|
|||
'id': mid,
|
||||
} if not rpc_results.get(mid):
|
||||
log.warning(
|
||||
f'Unexpected ws msg: {json.dumps(msg, indent=4)}'
|
||||
f'Unexpected ws msg?\n'
|
||||
f'{json.dumps(msg, indent=4)}'
|
||||
)
|
||||
|
||||
case {
|
||||
'method': _,
|
||||
'params': _,
|
||||
}:
|
||||
log.debug(f'Recieved\n{msg}')
|
||||
log.debug(
|
||||
f'Recieved\n'
|
||||
f'{msg!r}'
|
||||
)
|
||||
|
||||
case {
|
||||
'error': error
|
||||
|
|
@ -554,12 +562,15 @@ async def open_jsonrpc_session(
|
|||
result['event'].set()
|
||||
log.error(
|
||||
f'JSONRPC request failed\n'
|
||||
f'req: {req_msg}\n'
|
||||
f'resp: {error}\n'
|
||||
f'req: {req_msg!r}\n'
|
||||
f'resp: {error!r}\n'
|
||||
)
|
||||
|
||||
case _:
|
||||
log.warning(f'Unhandled JSON-RPC msg!?\n{msg}')
|
||||
log.warning(
|
||||
f'Unhandled JSON-RPC msg!?\n'
|
||||
f'{msg!r}'
|
||||
)
|
||||
|
||||
tn.start_soon(recv_task)
|
||||
yield json_rpc
|
||||
|
|
|
|||
|
|
@ -342,7 +342,10 @@ class MainWindow(QMainWindow):
|
|||
log.debug('Saved window geometry for next session')
|
||||
|
||||
# raising KBI seems to get intercepted by by Qt so just use the system.
|
||||
os.kill(os.getpid(), signal.SIGINT)
|
||||
os.kill(
|
||||
os.getpid(),
|
||||
signal.SIGINT,
|
||||
)
|
||||
|
||||
@property
|
||||
def status_bar(self) -> QStatusBar:
|
||||
|
|
@ -549,9 +552,9 @@ class MainWindow(QMainWindow):
|
|||
|
||||
# update godwidget and its children
|
||||
if self.godwidget:
|
||||
# update search widget if it exists
|
||||
if hasattr(self.godwidget, 'search') and self.godwidget.search:
|
||||
self.godwidget.search.update_fonts()
|
||||
# update search bg if it exists
|
||||
if search := getattr(self.godwidget, 'search', None):
|
||||
search.update_fonts()
|
||||
|
||||
# update order mode panes in all chart views
|
||||
self._update_chart_order_panes()
|
||||
|
|
@ -571,7 +574,10 @@ class MainWindow(QMainWindow):
|
|||
return
|
||||
|
||||
# iterate through all linked splits (hist and rt)
|
||||
for splits_name in ['hist_linked', 'rt_linked']:
|
||||
for splits_name in [
|
||||
'hist_linked',
|
||||
'rt_linked',
|
||||
]:
|
||||
splits = getattr(self.godwidget, splits_name, None)
|
||||
if not splits:
|
||||
continue
|
||||
|
|
@ -583,12 +589,14 @@ class MainWindow(QMainWindow):
|
|||
self._update_chart_axes(chart)
|
||||
|
||||
# update order pane
|
||||
if hasattr(chart, 'view'):
|
||||
view = chart.view
|
||||
if hasattr(view, 'order_mode') and view.order_mode:
|
||||
order_mode = view.order_mode
|
||||
if hasattr(order_mode, 'pane') and order_mode.pane:
|
||||
order_mode.pane.update_fonts()
|
||||
if (
|
||||
(view := getattr(chart, 'view', None))
|
||||
and
|
||||
(order_mode := getattr(view, 'order_mode', None))
|
||||
and
|
||||
(pane := getattr(order_mode, 'pane', None))
|
||||
):
|
||||
pane.update_fonts()
|
||||
|
||||
# also check subplots
|
||||
subplots = getattr(splits, 'subplots', {})
|
||||
|
|
@ -597,54 +605,90 @@ class MainWindow(QMainWindow):
|
|||
self._update_chart_axes(subplot_chart)
|
||||
|
||||
# update subplot order pane
|
||||
if hasattr(subplot_chart, 'view'):
|
||||
subplot_view = subplot_chart.view
|
||||
if hasattr(subplot_view, 'order_mode') and subplot_view.order_mode:
|
||||
subplot_order_mode = subplot_view.order_mode
|
||||
if hasattr(subplot_order_mode, 'pane') and subplot_order_mode.pane:
|
||||
subplot_order_mode.pane.update_fonts()
|
||||
if (
|
||||
(view := getattr(subplot_chart, 'view', None))
|
||||
and
|
||||
(order_mode := getattr(
|
||||
view, 'order_mode', None,
|
||||
))
|
||||
and
|
||||
(pane := getattr(order_mode, 'pane', None))
|
||||
):
|
||||
pane.update_fonts()
|
||||
|
||||
# resize all sidepanes to match main chart's sidepane width
|
||||
# this ensures volume/subplot sidepanes match the main chart
|
||||
if splits and hasattr(splits, 'resize_sidepanes'):
|
||||
splits.resize_sidepanes()
|
||||
# resize all sidepanes to match the
|
||||
# main chart's sidepane width; ensures
|
||||
# volume/subplot sidepanes match.
|
||||
if (
|
||||
splits
|
||||
and
|
||||
(resize := getattr(
|
||||
splits, 'resize_sidepanes', None,
|
||||
))
|
||||
):
|
||||
resize()
|
||||
|
||||
def _update_chart_axes(self, chart) -> None:
|
||||
'''Update axis fonts and sizing for a chart.'''
|
||||
'''
|
||||
Update axis fonts and sizing for a chart.
|
||||
|
||||
'''
|
||||
from . import _style
|
||||
|
||||
# update price axis (right side)
|
||||
if hasattr(chart, 'pi') and chart.pi:
|
||||
plot_item = chart.pi
|
||||
if plot_item := getattr(chart, 'pi', None):
|
||||
# get all axes from plot item
|
||||
for axis_name in ['left', 'right', 'bottom', 'top']:
|
||||
axis = plot_item.getAxis(axis_name)
|
||||
if axis and hasattr(axis, 'update_fonts'):
|
||||
axis.update_fonts(_style._font)
|
||||
for axis_name in [
|
||||
'left',
|
||||
'right',
|
||||
'bottom',
|
||||
'top',
|
||||
]:
|
||||
if (
|
||||
(axis := plot_item.getAxis(axis_name))
|
||||
and
|
||||
(update_fonts := getattr(
|
||||
axis, 'update_fonts', None,
|
||||
))
|
||||
):
|
||||
update_fonts(_style._font)
|
||||
|
||||
# force plot item to recalculate its entire layout
|
||||
# force plot item to recalculate
|
||||
# its entire layout
|
||||
plot_item.updateGeometry()
|
||||
|
||||
# force chart widget to update
|
||||
if hasattr(chart, 'updateGeometry'):
|
||||
chart.updateGeometry()
|
||||
if update_geom := getattr(chart, 'updateGeometry', None):
|
||||
update_geom()
|
||||
|
||||
# trigger a full scene update
|
||||
if hasattr(chart, 'update'):
|
||||
chart.update()
|
||||
if update := getattr(chart, 'update', None):
|
||||
update()
|
||||
|
||||
def _refresh_widget_fonts(self, widget: QWidget) -> None:
|
||||
def _refresh_widget_fonts(
|
||||
self,
|
||||
widget: QWidget,
|
||||
) -> None:
|
||||
'''
|
||||
Recursively update font sizes in all child widgets.
|
||||
Recursively update font sizes in all
|
||||
child widgets.
|
||||
|
||||
Handles widgets that have font-size
|
||||
hardcoded in their stylesheets.
|
||||
|
||||
This handles widgets that have font-size hardcoded in their stylesheets.
|
||||
'''
|
||||
from . import _style
|
||||
|
||||
# recursively process all children
|
||||
for child in widget.findChildren(QWidget):
|
||||
# skip widgets that have their own update_fonts method (handled separately)
|
||||
if hasattr(child, 'update_fonts'):
|
||||
# skip widgets that have custom update
|
||||
# methods; handled separately below.
|
||||
if getattr(child, 'update_fonts', None):
|
||||
log.debug(
|
||||
f'Skipping sub-widget with'
|
||||
f' custom font-update meth..\n'
|
||||
f'{child!r}\n'
|
||||
)
|
||||
continue
|
||||
|
||||
# update child's stylesheet if it has font-size
|
||||
|
|
@ -654,23 +698,35 @@ class MainWindow(QMainWindow):
|
|||
# this is a heuristic - may need refinement
|
||||
try:
|
||||
child.setFont(_style._font.font)
|
||||
except (AttributeError, RuntimeError):
|
||||
pass
|
||||
except (
|
||||
AttributeError,
|
||||
RuntimeError,
|
||||
):
|
||||
log.exception(
|
||||
'Failed to update sub-widget font?\n'
|
||||
)
|
||||
|
||||
# update child's font
|
||||
try:
|
||||
child.setFont(_style._font.font)
|
||||
except (AttributeError, RuntimeError):
|
||||
pass
|
||||
except (
|
||||
AttributeError,
|
||||
RuntimeError,
|
||||
):
|
||||
log.exception(
|
||||
'Failed to update sub-widget font?\n'
|
||||
)
|
||||
|
||||
|
||||
# singleton app per actor
|
||||
_qt_win: QMainWindow = None
|
||||
_qt_win: QMainWindow|None = None
|
||||
|
||||
|
||||
def main_window() -> MainWindow:
|
||||
'Return the actor-global Qt window.'
|
||||
'''
|
||||
Return the actor-global Qt window.
|
||||
|
||||
'''
|
||||
global _qt_win
|
||||
assert _qt_win
|
||||
return _qt_win
|
||||
|
|
|
|||
|
|
@ -1022,13 +1022,22 @@ async def open_order_mode(
|
|||
started.set()
|
||||
|
||||
for oid, msg in ems_dialog_msgs.items():
|
||||
|
||||
# HACK ALERT: ensure a resp field is filled out since
|
||||
# techincally the call below expects a ``Status``. TODO:
|
||||
# parse into proper ``Status`` equivalents ems-side?
|
||||
# msg.setdefault('resp', msg['broker_details']['resp'])
|
||||
# msg.setdefault('oid', msg['broker_details']['oid'])
|
||||
msg['brokerd_msg'] = msg
|
||||
ya_msg: dict = msg.setdefault(
|
||||
'brokerd_msg',
|
||||
msg,
|
||||
)
|
||||
if msg is not ya_msg:
|
||||
log.warning(
|
||||
f'A `.brokerd_msg` was already set for ems-dialog msg?\n'
|
||||
f'oid: {oid!r}\n'
|
||||
f'ya_msg: {ya_msg!r}\n'
|
||||
f'msg: {ya_msg!r}\n'
|
||||
)
|
||||
|
||||
await process_trade_msg(
|
||||
mode,
|
||||
|
|
|
|||
Loading…
Reference in New Issue