Compare commits
3 Commits
887e1ea6b7
...
c210c286a5
| Author | SHA1 | Date |
|---|---|---|
|
|
c210c286a5 | |
|
|
12b015cec4 | |
|
|
c5fa262474 |
|
|
@ -26,7 +26,6 @@ from collections import (
|
||||||
from contextlib import asynccontextmanager as acm
|
from contextlib import asynccontextmanager as acm
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
from math import isnan
|
from math import isnan
|
||||||
from pprint import pformat
|
|
||||||
from time import time_ns
|
from time import time_ns
|
||||||
from types import ModuleType
|
from types import ModuleType
|
||||||
from typing import (
|
from typing import (
|
||||||
|
|
@ -43,6 +42,7 @@ import trio
|
||||||
from trio_typing import TaskStatus
|
from trio_typing import TaskStatus
|
||||||
import tractor
|
import tractor
|
||||||
from tractor import trionics
|
from tractor import trionics
|
||||||
|
from tractor.devx.pformat import ppfmt
|
||||||
|
|
||||||
from ._util import (
|
from ._util import (
|
||||||
log, # sub-sys logger
|
log, # sub-sys logger
|
||||||
|
|
@ -490,7 +490,7 @@ async def open_brokerd_dialog(
|
||||||
msg = BrokerdPosition(**msg)
|
msg = BrokerdPosition(**msg)
|
||||||
log.info(
|
log.info(
|
||||||
f'loading pp for {brokermod.__name__}:\n'
|
f'loading pp for {brokermod.__name__}:\n'
|
||||||
f'{pformat(msg.to_dict())}',
|
f'{ppfmt(msg.to_dict())}',
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO: state any mismatch here?
|
# TODO: state any mismatch here?
|
||||||
|
|
@ -840,7 +840,7 @@ async def translate_and_relay_brokerd_events(
|
||||||
|
|
||||||
brokerd_msg: dict[str, Any]
|
brokerd_msg: dict[str, Any]
|
||||||
async for brokerd_msg in brokerd_trades_stream:
|
async for brokerd_msg in brokerd_trades_stream:
|
||||||
fmsg = pformat(brokerd_msg)
|
fmsg = ppfmt(brokerd_msg)
|
||||||
log.info(
|
log.info(
|
||||||
f'Rx brokerd trade msg:\n'
|
f'Rx brokerd trade msg:\n'
|
||||||
f'{fmsg}'
|
f'{fmsg}'
|
||||||
|
|
@ -1039,6 +1039,7 @@ async def translate_and_relay_brokerd_events(
|
||||||
)
|
)
|
||||||
|
|
||||||
status_msg.reqid = reqid # THIS LINE IS CRITICAL!
|
status_msg.reqid = reqid # THIS LINE IS CRITICAL!
|
||||||
|
if not status_msg.brokerd_msg:
|
||||||
status_msg.brokerd_msg = msg
|
status_msg.brokerd_msg = msg
|
||||||
status_msg.src = msg.broker_details['name']
|
status_msg.src = msg.broker_details['name']
|
||||||
|
|
||||||
|
|
@ -1072,7 +1073,7 @@ async def translate_and_relay_brokerd_events(
|
||||||
else: # open
|
else: # open
|
||||||
# relayed from backend but probably not handled so
|
# relayed from backend but probably not handled so
|
||||||
# just log it
|
# just log it
|
||||||
log.info(f'{broker} opened order {msg}')
|
log.info(f'{broker!r} opened order {msg}')
|
||||||
|
|
||||||
# BrokerdFill
|
# BrokerdFill
|
||||||
case {
|
case {
|
||||||
|
|
@ -1185,7 +1186,7 @@ async def translate_and_relay_brokerd_events(
|
||||||
}:
|
}:
|
||||||
msg = (
|
msg = (
|
||||||
f'Unhandled broker status for dialog {reqid}:\n'
|
f'Unhandled broker status for dialog {reqid}:\n'
|
||||||
f'{pformat(brokerd_msg)}'
|
f'{ppfmt(brokerd_msg)}'
|
||||||
)
|
)
|
||||||
if (
|
if (
|
||||||
oid := book._ems2brokerd_ids.inverse.get(reqid)
|
oid := book._ems2brokerd_ids.inverse.get(reqid)
|
||||||
|
|
@ -1194,7 +1195,7 @@ async def translate_and_relay_brokerd_events(
|
||||||
# clearable limits..
|
# clearable limits..
|
||||||
if status_msg := book._active.get(oid):
|
if status_msg := book._active.get(oid):
|
||||||
msg += (
|
msg += (
|
||||||
f'last status msg: {pformat(status_msg)}\n\n'
|
f'last status msg: {ppfmt(status_msg)}\n\n'
|
||||||
f'this msg:{fmsg}\n'
|
f'this msg:{fmsg}\n'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -1233,7 +1234,7 @@ async def process_client_order_cmds(
|
||||||
async for cmd in client_order_stream:
|
async for cmd in client_order_stream:
|
||||||
log.info(
|
log.info(
|
||||||
f'Received order cmd:\n'
|
f'Received order cmd:\n'
|
||||||
f'{pformat(cmd)}\n'
|
f'{ppfmt(cmd)}\n'
|
||||||
)
|
)
|
||||||
|
|
||||||
# CAWT DAMN we need struct support!
|
# CAWT DAMN we need struct support!
|
||||||
|
|
@ -1398,8 +1399,8 @@ async def process_client_order_cmds(
|
||||||
# handle relaying the ems side responses back to
|
# handle relaying the ems side responses back to
|
||||||
# the client/cmd sender from this request
|
# the client/cmd sender from this request
|
||||||
log.info(
|
log.info(
|
||||||
f'Sending live order to {broker}:\n'
|
f'Sending live order to {broker!r}:\n'
|
||||||
f'{pformat(msg)}'
|
f'{ppfmt(msg)}'
|
||||||
)
|
)
|
||||||
|
|
||||||
await brokerd_order_stream.send(msg)
|
await brokerd_order_stream.send(msg)
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,7 @@ async def _reconnect_forever(
|
||||||
async def proxy_msgs(
|
async def proxy_msgs(
|
||||||
ws: WebSocketConnection,
|
ws: WebSocketConnection,
|
||||||
rent_cs: trio.CancelScope, # parent cancel scope
|
rent_cs: trio.CancelScope, # parent cancel scope
|
||||||
):
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Receive (under `timeout` deadline) all msgs from from underlying
|
Receive (under `timeout` deadline) all msgs from from underlying
|
||||||
websocket and relay them to (calling) parent task via ``trio``
|
websocket and relay them to (calling) parent task via ``trio``
|
||||||
|
|
@ -206,7 +206,7 @@ async def _reconnect_forever(
|
||||||
except nobsws.recon_errors:
|
except nobsws.recon_errors:
|
||||||
log.exception(
|
log.exception(
|
||||||
f'{src_mod}\n'
|
f'{src_mod}\n'
|
||||||
f'{url} connection bail with:'
|
f'{url!r} connection failed\n'
|
||||||
)
|
)
|
||||||
with trio.CancelScope(shield=True):
|
with trio.CancelScope(shield=True):
|
||||||
await trio.sleep(0.5)
|
await trio.sleep(0.5)
|
||||||
|
|
@ -269,7 +269,7 @@ async def _reconnect_forever(
|
||||||
nobsws._ws = ws
|
nobsws._ws = ws
|
||||||
log.info(
|
log.info(
|
||||||
f'{src_mod}\n'
|
f'{src_mod}\n'
|
||||||
f'Connection success: {url}'
|
f'Connection success: {url!r}'
|
||||||
)
|
)
|
||||||
|
|
||||||
# begin relay loop to forward msgs
|
# begin relay loop to forward msgs
|
||||||
|
|
@ -361,7 +361,7 @@ async def open_autorecon_ws(
|
||||||
and restarts the full http(s) handshake on catches of certain
|
and restarts the full http(s) handshake on catches of certain
|
||||||
connetivity errors, or some user defined recv timeout.
|
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
|
entered/exitted around each connection reset; eg. for
|
||||||
(re)requesting subscriptions without requiring streaming setup
|
(re)requesting subscriptions without requiring streaming setup
|
||||||
code to rerun.
|
code to rerun.
|
||||||
|
|
@ -402,7 +402,8 @@ async def open_autorecon_ws(
|
||||||
except NoBsWs.recon_errors as con_err:
|
except NoBsWs.recon_errors as con_err:
|
||||||
log.warning(
|
log.warning(
|
||||||
f'Entire ws-channel disconnect due to,\n'
|
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(
|
async def open_jsonrpc_session(
|
||||||
url: str,
|
url: str,
|
||||||
start_id: int = 0,
|
start_id: int = 0,
|
||||||
response_type: type = JSONRPCResult,
|
response_type: Type[Struct] = JSONRPCResult,
|
||||||
msg_recv_timeout: float = float('inf'),
|
msg_recv_timeout: float = float('inf'),
|
||||||
# ^NOTE, since only `deribit` is using this jsonrpc stuff atm
|
# ^NOTE, since only `deribit` is using this jsonrpc stuff atm
|
||||||
# and options mkts are generally "slow moving"..
|
# 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
|
# broken and never restored with wtv init sequence is required to
|
||||||
# re-establish a working req-resp session.
|
# 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`.
|
Init a json-RPC-over-websocket connection to the provided `url`.
|
||||||
|
|
||||||
|
|
@ -531,14 +535,18 @@ async def open_jsonrpc_session(
|
||||||
'id': mid,
|
'id': mid,
|
||||||
} if not rpc_results.get(mid):
|
} if not rpc_results.get(mid):
|
||||||
log.warning(
|
log.warning(
|
||||||
f'Unexpected ws msg: {json.dumps(msg, indent=4)}'
|
f'Unexpected ws msg?\n'
|
||||||
|
f'{json.dumps(msg, indent=4)}'
|
||||||
)
|
)
|
||||||
|
|
||||||
case {
|
case {
|
||||||
'method': _,
|
'method': _,
|
||||||
'params': _,
|
'params': _,
|
||||||
}:
|
}:
|
||||||
log.debug(f'Recieved\n{msg}')
|
log.debug(
|
||||||
|
f'Recieved\n'
|
||||||
|
f'{msg!r}'
|
||||||
|
)
|
||||||
|
|
||||||
case {
|
case {
|
||||||
'error': error
|
'error': error
|
||||||
|
|
@ -554,12 +562,15 @@ async def open_jsonrpc_session(
|
||||||
result['event'].set()
|
result['event'].set()
|
||||||
log.error(
|
log.error(
|
||||||
f'JSONRPC request failed\n'
|
f'JSONRPC request failed\n'
|
||||||
f'req: {req_msg}\n'
|
f'req: {req_msg!r}\n'
|
||||||
f'resp: {error}\n'
|
f'resp: {error!r}\n'
|
||||||
)
|
)
|
||||||
|
|
||||||
case _:
|
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)
|
tn.start_soon(recv_task)
|
||||||
yield json_rpc
|
yield json_rpc
|
||||||
|
|
|
||||||
|
|
@ -342,7 +342,10 @@ class MainWindow(QMainWindow):
|
||||||
log.debug('Saved window geometry for next session')
|
log.debug('Saved window geometry for next session')
|
||||||
|
|
||||||
# raising KBI seems to get intercepted by by Qt so just use the system.
|
# 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
|
@property
|
||||||
def status_bar(self) -> QStatusBar:
|
def status_bar(self) -> QStatusBar:
|
||||||
|
|
@ -549,9 +552,9 @@ class MainWindow(QMainWindow):
|
||||||
|
|
||||||
# update godwidget and its children
|
# update godwidget and its children
|
||||||
if self.godwidget:
|
if self.godwidget:
|
||||||
# update search widget if it exists
|
# update search bg if it exists
|
||||||
if hasattr(self.godwidget, 'search') and self.godwidget.search:
|
if search := getattr(self.godwidget, 'search', None):
|
||||||
self.godwidget.search.update_fonts()
|
search.update_fonts()
|
||||||
|
|
||||||
# update order mode panes in all chart views
|
# update order mode panes in all chart views
|
||||||
self._update_chart_order_panes()
|
self._update_chart_order_panes()
|
||||||
|
|
@ -571,7 +574,10 @@ class MainWindow(QMainWindow):
|
||||||
return
|
return
|
||||||
|
|
||||||
# iterate through all linked splits (hist and rt)
|
# 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)
|
splits = getattr(self.godwidget, splits_name, None)
|
||||||
if not splits:
|
if not splits:
|
||||||
continue
|
continue
|
||||||
|
|
@ -583,12 +589,14 @@ class MainWindow(QMainWindow):
|
||||||
self._update_chart_axes(chart)
|
self._update_chart_axes(chart)
|
||||||
|
|
||||||
# update order pane
|
# update order pane
|
||||||
if hasattr(chart, 'view'):
|
if (
|
||||||
view = chart.view
|
(view := getattr(chart, 'view', None))
|
||||||
if hasattr(view, 'order_mode') and view.order_mode:
|
and
|
||||||
order_mode = view.order_mode
|
(order_mode := getattr(view, 'order_mode', None))
|
||||||
if hasattr(order_mode, 'pane') and order_mode.pane:
|
and
|
||||||
order_mode.pane.update_fonts()
|
(pane := getattr(order_mode, 'pane', None))
|
||||||
|
):
|
||||||
|
pane.update_fonts()
|
||||||
|
|
||||||
# also check subplots
|
# also check subplots
|
||||||
subplots = getattr(splits, 'subplots', {})
|
subplots = getattr(splits, 'subplots', {})
|
||||||
|
|
@ -597,54 +605,90 @@ class MainWindow(QMainWindow):
|
||||||
self._update_chart_axes(subplot_chart)
|
self._update_chart_axes(subplot_chart)
|
||||||
|
|
||||||
# update subplot order pane
|
# update subplot order pane
|
||||||
if hasattr(subplot_chart, 'view'):
|
if (
|
||||||
subplot_view = subplot_chart.view
|
(view := getattr(subplot_chart, 'view', None))
|
||||||
if hasattr(subplot_view, 'order_mode') and subplot_view.order_mode:
|
and
|
||||||
subplot_order_mode = subplot_view.order_mode
|
(order_mode := getattr(
|
||||||
if hasattr(subplot_order_mode, 'pane') and subplot_order_mode.pane:
|
view, 'order_mode', None,
|
||||||
subplot_order_mode.pane.update_fonts()
|
))
|
||||||
|
and
|
||||||
|
(pane := getattr(order_mode, 'pane', None))
|
||||||
|
):
|
||||||
|
pane.update_fonts()
|
||||||
|
|
||||||
# resize all sidepanes to match main chart's sidepane width
|
# resize all sidepanes to match the
|
||||||
# this ensures volume/subplot sidepanes match the main chart
|
# main chart's sidepane width; ensures
|
||||||
if splits and hasattr(splits, 'resize_sidepanes'):
|
# volume/subplot sidepanes match.
|
||||||
splits.resize_sidepanes()
|
if (
|
||||||
|
splits
|
||||||
|
and
|
||||||
|
(resize := getattr(
|
||||||
|
splits, 'resize_sidepanes', None,
|
||||||
|
))
|
||||||
|
):
|
||||||
|
resize()
|
||||||
|
|
||||||
def _update_chart_axes(self, chart) -> None:
|
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
|
from . import _style
|
||||||
|
|
||||||
# update price axis (right side)
|
# update price axis (right side)
|
||||||
if hasattr(chart, 'pi') and chart.pi:
|
if plot_item := getattr(chart, 'pi', None):
|
||||||
plot_item = chart.pi
|
|
||||||
# get all axes from plot item
|
# get all axes from plot item
|
||||||
for axis_name in ['left', 'right', 'bottom', 'top']:
|
for axis_name in [
|
||||||
axis = plot_item.getAxis(axis_name)
|
'left',
|
||||||
if axis and hasattr(axis, 'update_fonts'):
|
'right',
|
||||||
axis.update_fonts(_style._font)
|
'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()
|
plot_item.updateGeometry()
|
||||||
|
|
||||||
# force chart widget to update
|
# force chart widget to update
|
||||||
if hasattr(chart, 'updateGeometry'):
|
if update_geom := getattr(chart, 'updateGeometry', None):
|
||||||
chart.updateGeometry()
|
update_geom()
|
||||||
|
|
||||||
# trigger a full scene update
|
# trigger a full scene update
|
||||||
if hasattr(chart, 'update'):
|
if update := getattr(chart, 'update', None):
|
||||||
chart.update()
|
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
|
from . import _style
|
||||||
|
|
||||||
# recursively process all children
|
# recursively process all children
|
||||||
for child in widget.findChildren(QWidget):
|
for child in widget.findChildren(QWidget):
|
||||||
# skip widgets that have their own update_fonts method (handled separately)
|
# skip widgets that have custom update
|
||||||
if hasattr(child, 'update_fonts'):
|
# 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
|
continue
|
||||||
|
|
||||||
# update child's stylesheet if it has font-size
|
# update child's stylesheet if it has font-size
|
||||||
|
|
@ -654,23 +698,35 @@ class MainWindow(QMainWindow):
|
||||||
# this is a heuristic - may need refinement
|
# this is a heuristic - may need refinement
|
||||||
try:
|
try:
|
||||||
child.setFont(_style._font.font)
|
child.setFont(_style._font.font)
|
||||||
except (AttributeError, RuntimeError):
|
except (
|
||||||
pass
|
AttributeError,
|
||||||
|
RuntimeError,
|
||||||
|
):
|
||||||
|
log.exception(
|
||||||
|
'Failed to update sub-widget font?\n'
|
||||||
|
)
|
||||||
|
|
||||||
# update child's font
|
# update child's font
|
||||||
try:
|
try:
|
||||||
child.setFont(_style._font.font)
|
child.setFont(_style._font.font)
|
||||||
except (AttributeError, RuntimeError):
|
except (
|
||||||
pass
|
AttributeError,
|
||||||
|
RuntimeError,
|
||||||
|
):
|
||||||
|
log.exception(
|
||||||
|
'Failed to update sub-widget font?\n'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# singleton app per actor
|
# singleton app per actor
|
||||||
_qt_win: QMainWindow = None
|
_qt_win: QMainWindow|None = None
|
||||||
|
|
||||||
|
|
||||||
def main_window() -> MainWindow:
|
def main_window() -> MainWindow:
|
||||||
'Return the actor-global Qt window.'
|
'''
|
||||||
|
Return the actor-global Qt window.
|
||||||
|
|
||||||
|
'''
|
||||||
global _qt_win
|
global _qt_win
|
||||||
assert _qt_win
|
assert _qt_win
|
||||||
return _qt_win
|
return _qt_win
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue