Compare commits

..

No commits in common. "d4dc8854e019ebf5b736c833b9db592bee2a68a8" and "ebc5bbd42be03632ee476eec18a2ca5eb4b8bc4a" have entirely different histories.

4 changed files with 30 additions and 57 deletions

View File

@ -37,7 +37,6 @@ except ModuleNotFoundError:
from tractor._exceptions import reg_err_types
from tractor.devx.pformat import ppfmt
from .log import get_logger
log = get_logger('broker-config')
@ -359,55 +358,29 @@ def write(
def load_accounts(
providers: list[str] | None = None
) -> bidict[str, str | None]:
conf, path = load(
conf_name='brokers',
)
accounts = bidict({
# XXX, default paper-engine entry; this MUST be set.
'paper': None,
})
msg: str = (
'Loading account(s) from `brokers.toml`,\n'
)
for (
provider_name,
section,
) in conf.items():
accounts_section: dict[str, str] = section.get('accounts')
if accounts_section is None:
msg += f'No accounts declared for {provider_name!r}?\n'
continue
# msg += f'Loaded accounts for {provider_name!r}?\n'
accounts = bidict()
for provider_name, section in conf.items():
accounts_section = section.get('accounts')
if (
providers is None
or (
providers
and
provider_name in providers
)
providers is None or
providers and provider_name in providers
):
for (
label,
value,
) in accounts_section.items():
account_alias: str = f'{provider_name}.{label}'
accounts[account_alias] = value
msg += f'{account_alias} = {value!r}\n'
if accounts_section is None:
log.warning(f'No accounts named for {provider_name}?')
continue
else:
log.debug(
f'NOT loading account(s) for entry in `brokers.toml`,\n'
f'The account provider was not requested for loading.\n'
f'requested-providers: {providers!r}\n'
f'this-provider: {provider_name!r}\n'
f'\n'
f'{ppfmt(accounts_section)}\n'
)
# ?TODO? mk this bp work?
# breakpoint()
for label, value in accounts_section.items():
accounts[
f'{provider_name}.{label}'
] = value
# our default paper engine entry
accounts['paper'] = None
log.info(msg)
return accounts

View File

@ -218,13 +218,11 @@ async def maybe_spawn_daemon(
lock.statistics().owner is current_task()
):
log.exception(
f'Releasing stale lock after crash..?\n'
f'\n'
f'Releasing stale lock after crash..?'
f'{err!r}\n'
)
lock.release()
raise
raise err
async def spawn_emsd(

View File

@ -131,11 +131,11 @@ async def _async_main(
async with (
tractor.trionics.collapse_eg(),
trio.open_nursery() as tn,
trio.open_nursery() as root_n,
):
# set root nursery and task stack for spawning other charts/feeds
# that run cached in the bg
godwidget._root_n = tn
godwidget._root_n = root_n
# setup search widget and focus main chart view at startup
# search widget is a singleton alongside the godwidget
@ -165,7 +165,7 @@ async def _async_main(
# load other providers into search **after**
# the chart's select cache
for brokername, mod in needed_brokermods.items():
tn.start_soon(
root_n.start_soon(
load_provider_search,
mod,
loglevel,

View File

@ -1346,6 +1346,7 @@ async def display_symbol_data(
fqmes,
loglevel=loglevel,
tick_throttle=cycles_per_feed,
) as feed,
):
@ -1460,7 +1461,7 @@ async def display_symbol_data(
async with (
tractor.trionics.collapse_eg(),
trio.open_nursery() as tn,
trio.open_nursery() as ln,
):
# if available load volume related built-in display(s)
vlm_charts: dict[
@ -1471,7 +1472,7 @@ async def display_symbol_data(
flume.has_vlm()
and vlm_chart is None
):
vlm_chart = vlm_charts[fqme] = await tn.start(
vlm_chart = vlm_charts[fqme] = await ln.start(
open_vlm_displays,
rt_linked,
flume,
@ -1479,7 +1480,7 @@ async def display_symbol_data(
# load (user's) FSP set (otherwise known as "indicators")
# from an input config.
tn.start_soon(
ln.start_soon(
start_fsp_displays,
rt_linked,
flume,
@ -1603,11 +1604,11 @@ async def display_symbol_data(
# start update loop task
dss: dict[str, DisplayState] = {}
tn.start_soon(
ln.start_soon(
partial(
graphics_update_loop,
dss=dss,
nurse=tn,
nurse=ln,
godwidget=godwidget,
feed=feed,
# min_istream,
@ -1622,6 +1623,7 @@ async def display_symbol_data(
order_ctl_fqme: str = fqmes[0]
mode: OrderMode
async with (
open_order_mode(
feed,
godwidget,