Merge pull request #350 from pikers/ib_rt_pp_update_hotfix

`ib` rt pps update hotfix..
null_last_quote_fix
goodboy 2022-07-05 20:55:14 -04:00 committed by GitHub
commit a229996ebe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 17 deletions

View File

@ -295,7 +295,10 @@ async def update_ledger_from_api_trades(
trade_entries: list[dict[str, Any]],
client: Union[Client, MethodProxy],
) -> dict[str, pp.Transaction]:
) -> tuple[
dict[str, pp.Transaction],
dict[str, dict],
]:
conf = get_config()
@ -326,14 +329,12 @@ async def update_ledger_from_api_trades(
# write recent session's trades to the user's (local) ledger file.
records: dict[str, pp.Transactions] = {}
for acctid, trades_by_id in entries.items():
with pp.open_trade_ledger('ib', acctid) as ledger:
ledger.update(trades_by_id)
for acctid, trades_by_id in entries.items():
# normalize to transaction form
records[acctid] = norm_trade_records(trades_by_id)
return records
return records, entries
async def update_and_audit_msgs(
@ -518,10 +519,14 @@ async def trades_dialogue(
new_trades = {}
for account, proxy in proxies.items():
trades = await proxy.trades()
new_trades.update(await update_ledger_from_api_trades(
(
records_by_acct,
ledger_entries,
) = await update_ledger_from_api_trades(
trades,
proxy,
))
)
new_trades.update(records_by_acct)
for acctid, trans in new_trades.items():
for t in trans:
@ -573,6 +578,16 @@ async def trades_dialogue(
tuple(name for name in accounts_def if name in accounts),
))
# TODO: maybe just write on teardown?
# we might also want to delegate a specific actor for
# ledger writing / reading for speed?
# write ledger with all new trades **AFTER** we've updated the
# `pps.toml` from the original ledger state!
for acctid, trades_by_id in ledger_entries.items():
with pp.open_trade_ledger('ib', acctid) as ledger:
ledger.update(trades_by_id)
async with (
ctx.open_stream() as ems_stream,
trio.open_nursery() as n,
@ -609,10 +624,11 @@ async def emit_pp_update(
proxy = proxies[acctid]
acctname = acctid.strip('ib.')
records = (await update_ledger_from_api_trades(
records_by_acct, ledger_entries = await update_ledger_from_api_trades(
[trade_entry],
proxy,
))[acctname]
)
records = records_by_acct[acctname]
r = records[0]
# update and load all positions from `pps.toml`, cross check with
@ -627,6 +643,12 @@ async def emit_pp_update(
ledger_reload={r.bsuid: r.fqsn},
)
# NOTE: write ledger with all new trades **AFTER** we've updated the
# `pps.toml` from the original ledger state!
for acctid, trades_by_id in ledger_entries.items():
with pp.open_trade_ledger('ib', acctid) as ledger:
ledger.update(trades_by_id)
for pos in filter(
bool,
[active.get(r.bsuid), closed.get(r.bsuid)]
@ -760,7 +782,7 @@ async def deliver_trade_events(
{
'contract': asdict(fill.contract),
'execution': asdict(fill.execution),
'commissionReport': asdict(fill.commissionReport),
# 'commissionReport': asdict(fill.commissionReport),
# supposedly server fill time?
'broker_time': execu.time,
'name': 'ib',
@ -813,6 +835,15 @@ async def deliver_trade_events(
trade_entry = ids2fills.setdefault(execid, {})
fill_already_rx = bool(trade_entry)
# only fire a pp msg update if,
# - we haven't already
# - the fill event has already arrived
# but it didn't yet have a commision report
# which we fill in now.
if (
fill_already_rx
and 'commissionReport' not in trade_entry
):
# no fill msg has arrived yet so just fill out the
# cost report for now and when the fill arrives a pp
# msg can be emitted.
@ -820,7 +851,6 @@ async def deliver_trade_events(
{'commissionReport': asdict(cr)}
)
if fill_already_rx:
await emit_pp_update(
ems_stream,
trade_entry,