diff --git a/piker/clearing/_ems.py b/piker/clearing/_ems.py index 782351c0..c77ffd1b 100644 --- a/piker/clearing/_ems.py +++ b/piker/clearing/_ems.py @@ -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,7 +1039,8 @@ async def translate_and_relay_brokerd_events( ) status_msg.reqid = reqid # THIS LINE IS CRITICAL! - status_msg.brokerd_msg = msg + if not status_msg.brokerd_msg: + status_msg.brokerd_msg = msg status_msg.src = msg.broker_details['name'] if not status_msg.req: @@ -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)