README.rst

@@ -95,15 +95,12 @@ bc why install with `python` when you can faster with `rust` ::
 
 include all GUIs (ex. for charting)::
 
-    uv sync --group uis
+    uv sync --extra uis
 
-AND with **all** our normal hacking tools::
+AND with all our hacking tools and WIP integrations::
 
-    uv sync --dev
+    uv sync --dev --all-extras 
 
-AND if you want to try WIP integrations::
-
-    uv sync --all-groups
 
 Ensure you can run the root-daemon::
 

piker/accounting/__init__.py

@@ -19,10 +19,8 @@
 for tendiez.
 
 '''
-from piker.log import (
+from ..log import get_logger
-    get_console_log,
+
-    get_logger,
-)
 from .calc import (
     iter_by_dt,
 )
@@ -35,6 +33,7 @@ from ._pos import (
     Account,
     load_account,
     load_account_from_ledger,
+    open_pps,
     open_account,
     Position,
 )
@@ -53,17 +52,7 @@ from ._allocate import (
 
 
 log = get_logger(__name__)
-# ?TODO, enable console on import
-# [ ] necessary? or `open_brokerd_dialog()` doing it is sufficient?
-#
-# bc might as well enable whenev imported by
-# other sub-sys code (namely `.clearing`).
-get_console_log(
-    level='warning',
-    name=__name__,
-)
 
-# TODO, the `as <samename>` style?
 __all__ = [
     'Account',
     'Allocator',
@@ -79,6 +68,7 @@ __all__ = [
     'load_account_from_ledger',
     'mk_allocator',
     'open_account',
+    'open_pps',
     'open_trade_ledger',
     'unpack_fqme',
     'DerivTypes',

piker/accounting/_pos.py

@@ -60,16 +60,12 @@ from ..clearing._messages import (
     BrokerdPosition,
 )
 from piker.types import Struct
-from piker.log import (
+from piker.log import get_logger
-    get_logger,
-)
 
 if TYPE_CHECKING:
     from piker.data._symcache import SymbologyCache
 
-log = get_logger(
+log = get_logger(__name__)
-    name=__name__,
-)
 
 
 class Position(Struct):
@@ -360,12 +356,13 @@ class Position(Struct):
     ) -> bool:
         '''
         Update clearing table by calculating the rolling ppu and
-        (accumulative) size in both the clears entry and local attrs
+        (accumulative) size in both the clears entry and local
-        state.
+        attrs state.
 
         Inserts are always done in datetime sorted order.
 
         '''
+        # added: bool = False
         tid: str = t.tid
         if tid in self._events:
             log.debug(
@@ -373,7 +370,7 @@ class Position(Struct):
                 f'\n'
                 f'{t}\n'
             )
-            return False
+            # return added
 
         # TODO: apparently this IS possible with a dict but not
         # common and probably not that beneficial unless we're also
@@ -454,12 +451,6 @@ class Position(Struct):
     # def suggest_split(self) -> float:
     #     ...
 
-    # ?TODO, for sending rendered state over the wire?
-    # def summary(self) -> PositionSummary:
-        # do minimal conversion to a subset of fields
-        # currently defined in `.clearing._messages.BrokerdPosition`
-
-
 
 class Account(Struct):
     '''
@@ -503,9 +494,9 @@ class Account(Struct):
 
     def update_from_ledger(
         self,
-        ledger: TransactionLedger|dict[str, Transaction],
+        ledger: TransactionLedger | dict[str, Transaction],
         cost_scalar: float = 2,
-        symcache: SymbologyCache|None = None,
+        symcache: SymbologyCache | None = None,
 
         _mktmap_table: dict[str, MktPair] | None = None,
 
@@ -758,7 +749,7 @@ class Account(Struct):
         # XXX WTF: if we use a tomlkit.Integer here we get this
         # super weird --1 thing going on for cumsize!?1!
         # NOTE: the fix was to always float() the size value loaded
-        # in open_account() below!
+        # in open_pps() below!
         config.write(
             config=self.conf,
             path=self.conf_path,
@@ -942,6 +933,7 @@ def open_account(
             clears_table['dt'] = dt
             trans.append(Transaction(
                 fqme=bs_mktid,
+                # sym=mkt,
                 bs_mktid=bs_mktid,
                 tid=tid,
                 # XXX: not sure why sometimes these are loaded as
@@ -964,22 +956,11 @@ def open_account(
         ):
             expiry: pendulum.DateTime = pendulum.parse(expiry)
 
-        # !XXX, should never be duplicates over
+        pp = pp_objs[bs_mktid] = Position(
-        # a backend-(broker)-system's unique market-IDs!
+            mkt,
-        if pos := pp_objs.get(bs_mktid):
+            split_ratio=split_ratio,
-            if mkt != pos.mkt:
+            bs_mktid=bs_mktid,
-                log.warning(
+        )
-                    f'Duplicated position but diff `MktPair.fqme` ??\n'
-                    f'bs_mktid: {bs_mktid!r}\n'
-                    f'pos.mkt: {pos.mkt}\n'
-                    f'mkt: {mkt}\n'
-                )
-        else:
-            pos = pp_objs[bs_mktid] = Position(
-                mkt,
-                split_ratio=split_ratio,
-                bs_mktid=bs_mktid,
-            )
 
         # XXX: super critical, we need to be sure to include
         # all pps.toml clears to avoid reusing clears that were
@@ -987,13 +968,8 @@ def open_account(
         # state, since today's records may have already been
         # processed!
         for t in trans:
-            added: bool = pos.add_clear(t)
+            pp.add_clear(t)
-            if not added:
+
-                log.warning(
-                    f'Txn already recorded in pp ??\n'
-                    f'\n'
-                    f'{t}\n'
-                )
     try:
         yield acnt
     finally:
@@ -1001,6 +977,20 @@ def open_account(
             acnt.write_config()
 
 
+# TODO: drop the old name and THIS!
+@cm
+def open_pps(
+    *args,
+    **kwargs,
+) -> Generator[Account, None, None]:
+    log.warning(
+        '`open_pps()` is now deprecated!\n'
+        'Please use `with open_account() as cnt:`'
+    )
+    with open_account(*args, **kwargs) as acnt:
+        yield acnt
+
+
 def load_account_from_ledger(
 
     brokername: str,

piker/accounting/calc.py

@@ -22,9 +22,7 @@ you know when you're losing money (if possible) XD
 from __future__ import annotations
 from collections.abc import ValuesView
 from contextlib import contextmanager as cm
-from functools import partial
 from math import copysign
-from pprint import pformat
 from typing import (
     Any,
     Callable,
@@ -32,7 +30,6 @@ from typing import (
     TYPE_CHECKING,
 )
 
-from tractor.devx import maybe_open_crash_handler
 import polars as pl
 from pendulum import (
     DateTime,
@@ -40,16 +37,12 @@ from pendulum import (
     parse,
 )
 
-from ..log import get_logger
-
 if TYPE_CHECKING:
     from ._ledger import (
         Transaction,
         TransactionLedger,
     )
 
-log = get_logger(__name__)
-
 
 def ppu(
     clears: Iterator[Transaction],
@@ -245,9 +238,6 @@ def iter_by_dt(
 
     def dyn_parse_to_dt(
         tx: tuple[str, dict[str, Any]] | Transaction,
-
-        debug: bool = False,
-        _invalid: list|None = None,
     ) -> DateTime:
 
         # handle `.items()` inputs
@@ -260,90 +250,52 @@ def iter_by_dt(
         # get best parser for this record..
         for k in parsers:
             if (
-                (v := getattr(tx, k, None))
+                isdict and k in tx
                 or
-                (
+                getattr(tx, k, None)
-                    isdict
-                    and
-                    (v := tx.get(k))
-                )
             ):
+                v = (
+                    tx[k] if isdict
+                    else tx.dt
+                )
+                assert v is not None, (
+                    f'No valid value for `{k}`!?'
+                )
+
                 # only call parser on the value if not None from
                 # the `parsers` table above (when NOT using
                 # `.get()`), otherwise pass through the value and
                 # sort on it directly
                 if (
                     not isinstance(v, DateTime)
-                    and
+                    and (parser := parsers.get(k))
-                    (parser := parsers.get(k))
                 ):
-                    ret = parser(v)
+                    return parser(v)
                 else:
-                    ret = v
+                    return v
 
-                return ret
-
-            else:
-                log.debug(
-                    f'Parser-field not found in txn\n'
-                    f'\n'
-                    f'parser-field: {k!r}\n'
-                    f'txn: {tx!r}\n'
-                    f'\n'
-                    f'Trying next..\n'
-                )
-                continue
-
-        # XXX: we should never really get here bc it means some kinda
-        # bad txn-record (field) data..
-        #
-        # -> set the `debug_mode = True` if you want to trace such
-        # cases from REPL ;)
         else:
+            # TODO: move to top?
+            from piker.log import get_logger
+            log = get_logger(__name__)
+
             # XXX: we should really never get here..
             # only if a ledger record has no expected sort(able)
             # field will we likely hit this.. like with ze IB.
             # if no sortable field just deliver epoch?
             log.warning(
                 'No (time) sortable field for TXN:\n'
-                f'{tx!r}\n'
+                f'{tx}\n'
             )
-            report: str = (
+            return from_timestamp(0)
-                f'No supported time-field found in txn !?\n'
+            # breakpoint()
-                f'\n'
-                f'supported-time-fields: {parsers!r}\n'
-                f'\n'
-                f'txn: {tx!r}\n'
-            )
-            if debug:
-                with maybe_open_crash_handler(
-                    pdb=debug,
-                    raise_on_exit=False,
-                ):
-                    raise ValueError(report)
-            else:
-                log.error(report)
 
-            if _invalid is not None:
-                _invalid.append(tx)
-                return from_timestamp(0.)
 
-    entry: tuple[str, dict]|Transaction
+    entry: tuple[str, dict] | Transaction
-    invalid: list = []
     for entry in sorted(
         records,
-        key=key or partial(
+        key=key or dyn_parse_to_dt,
-            dyn_parse_to_dt,
-            _invalid=invalid,
-        ),
     ):
-        if entry in invalid:
-            log.warning(
-                f'Ignoring txn w invalid timestamp ??\n'
-                f'{pformat(entry)}\n'
-            )
-            continue
-
         # NOTE the type sig above; either pairs or txns B)
         yield entry
 
@@ -406,7 +358,6 @@ def open_ledger_dfs(
     acctname: str,
 
     ledger: TransactionLedger | None = None,
-    debug_mode: bool = False,
 
     **kwargs,
 
@@ -421,10 +372,8 @@ def open_ledger_dfs(
     can update the ledger on exit.
 
     '''
-    with maybe_open_crash_handler(
+    from piker.toolz import open_crash_handler
-        pdb=debug_mode,
+    with open_crash_handler():
-        # raise_on_exit=False,
-    ):
         if not ledger:
             import time
             from ._ledger import open_trade_ledger

piker/accounting/cli.py

@@ -21,6 +21,7 @@ CLI front end for trades ledger and position tracking management.
 from __future__ import annotations
 from pprint import pformat
 
+
 from rich.console import Console
 from rich.markdown import Markdown
 import polars as pl
@@ -28,10 +29,7 @@ import tractor
 import trio
 import typer
 
-from piker.log import (
+from ..log import get_logger
-    get_console_log,
-    get_logger,
-)
 from ..service import (
     open_piker_runtime,
 )
@@ -47,7 +45,6 @@ from .calc import (
     open_ledger_dfs,
 )
 
-log = get_logger(name=__name__)
 
 ledger = typer.Typer()
 
@@ -82,10 +79,7 @@ def sync(
         "-l",
     ),
 ):
-    log = get_console_log(
+    log = get_logger(loglevel)
-        level=loglevel,
-        name=__name__,
-    )
     console = Console()
 
     pair: tuple[str, str]

piker/brokers/__init__.py

@@ -25,16 +25,15 @@ from types import ModuleType
 
 from tractor.trionics import maybe_open_context
 
-from piker.log import (
-    get_logger,
-)
 from ._util import (
+    log,
     BrokerError,
     SymbolNotFound,
     NoData,
     DataUnavailable,
     DataThrottle,
     resproc,
+    get_logger,
 )
 
 __all__: list[str] = [
@@ -44,6 +43,7 @@ __all__: list[str] = [
     'DataUnavailable',
     'DataThrottle',
     'resproc',
+    'get_logger',
 ]
 
 __brokers__: list[str] = [
@@ -65,10 +65,6 @@ __brokers__: list[str] = [
     # bitso
 ]
 
-log = get_logger(
-    name=__name__,
-)
-
 
 def get_brokermod(brokername: str) -> ModuleType:
     '''

piker/brokers/_daemon.py

@@ -33,18 +33,12 @@ import exceptiongroup as eg
 import tractor
 import trio
 
-from piker.log import (
-    get_logger,
-    get_console_log,
-)
 from . import _util
 from . import get_brokermod
 
 if TYPE_CHECKING:
     from ..data import _FeedsBus
 
-log = get_logger(name=__name__)
-
 # `brokerd` enabled modules
 # TODO: move this def to the `.data` subpkg..
 # NOTE: keeping this list as small as possible is part of our caps-sec
@@ -65,7 +59,7 @@ _data_mods: str = [
 async def _setup_persistent_brokerd(
     ctx: tractor.Context,
     brokername: str,
-    loglevel: str|None = None,
+    loglevel: str | None = None,
 
 ) -> None:
     '''
@@ -78,14 +72,13 @@ async def _setup_persistent_brokerd(
     # since all hosted daemon tasks will reference this same
     # log instance's (actor local) state and thus don't require
     # any further (level) configuration on their own B)
-    actor: tractor.Actor = tractor.current_actor()
+    log = _util.get_console_log(
-    tll: str = actor.loglevel
+        loglevel or tractor.current_actor().loglevel,
-    log = get_console_log(
-        level=loglevel or tll,
         name=f'{_util.subsys}.{brokername}',
-        with_tractor_log=bool(tll),
     )
-    assert log.name == _util.subsys
+
+    # set global for this actor to this new process-wide instance B)
+    _util.log = log
 
     # further, set the log level on any broker broker specific
     # logger instance.
@@ -104,7 +97,7 @@ async def _setup_persistent_brokerd(
     # NOTE: see ep invocation details inside `.data.feed`.
     try:
         async with (
-            # tractor.trionics.collapse_eg(),
+            tractor.trionics.collapse_eg(),
             trio.open_nursery() as service_nursery
         ):
             bus: _FeedsBus = feed.get_feed_bus(
@@ -200,6 +193,7 @@ def broker_init(
 
 
 async def spawn_brokerd(
+
     brokername: str,
     loglevel: str | None = None,
 
@@ -207,10 +201,8 @@ async def spawn_brokerd(
 
 ) -> bool:
 
-    log.info(
+    from piker.service._util import log  # use service mngr log
-        f'Spawning broker-daemon,\n'
+    log.info(f'Spawning {brokername} broker daemon')
-        f'backend: {brokername!r}'
-    )
 
     (
         brokermode,
@@ -257,7 +249,7 @@ async def spawn_brokerd(
 async def maybe_spawn_brokerd(
 
     brokername: str,
-    loglevel: str|None = None,
+    loglevel: str | None = None,
 
     **pikerd_kwargs,
 
@@ -273,7 +265,8 @@ async def maybe_spawn_brokerd(
     from piker.service import maybe_spawn_daemon
 
     async with maybe_spawn_daemon(
-        service_name=f'brokerd.{brokername}',
+
+        f'brokerd.{brokername}',
         service_task_target=spawn_brokerd,
         spawn_args={
             'brokername': brokername,

piker/brokers/_util.py

@@ -19,13 +19,15 @@ Handy cross-broker utils.
 
 """
 from __future__ import annotations
-# from functools import partial
+from functools import partial
 
 import json
 import httpx
 import logging
 
-from piker.log import (
+from ..log import (
+    get_logger,
+    get_console_log,
     colorize_json,
 )
 subsys: str = 'piker.brokers'
@@ -33,22 +35,12 @@ subsys: str = 'piker.brokers'
 # NOTE: level should be reset by any actor that is spawned
 # as well as given a (more) explicit name/key such
 # as `piker.brokers.binance` matching the subpkg.
-# log = get_logger(subsys)
+log = get_logger(subsys)
 
-# ?TODO?? we could use this approach, but we need to be able
+get_console_log = partial(
-# to pass multiple `name=` values so for example we can include the
+    get_console_log,
-# emissions in `.accounting._pos` and others!
+    name=subsys,
-# [ ] maybe we could do the `log = get_logger()` above,
+)
-# then cycle through the list of subsys mods we depend on
-# and then get all their loggers and pass them to
-# `get_console_log(logger=)`??
-# [ ] OR just write THIS `get_console_log()` as a hook which does
-# that based on who calls it?.. i dunno
-#
-# get_console_log = partial(
-#     get_console_log,
-#     name=subsys,
-# )
 
 
 class BrokerError(Exception):

piker/brokers/binance/broker.py

@@ -37,9 +37,8 @@ import trio
 from piker.accounting import (
     Asset,
 )
-from piker.log import (
+from piker.brokers._util import (
     get_logger,
-    get_console_log,
 )
 from piker.data._web_bs import (
     open_autorecon_ws,
@@ -70,9 +69,7 @@ from .venues import (
 )
 from .api import Client
 
-log = get_logger(
+log = get_logger('piker.brokers.binance')
-    name=__name__,
-)
 
 
 # Fee schedule template, mostly for paper engine fees modelling.
@@ -248,16 +245,9 @@ async def handle_order_requests(
 @tractor.context
 async def open_trade_dialog(
     ctx: tractor.Context,
-    loglevel: str = 'warning',
 
 ) -> AsyncIterator[dict[str, Any]]:
 
-    # enable piker.clearing console log for *this* `brokerd` subactor
-    get_console_log(
-        level=loglevel,
-        name=__name__,
-    )
-
     # TODO: how do we set this from the EMS such that
     # positions are loaded from the correct venue on the user
     # stream at startup? (that is in an attempt to support both

piker/brokers/binance/feed.py

@@ -64,9 +64,9 @@ from piker.data._web_bs import (
     open_autorecon_ws,
     NoBsWs,
 )
-from piker.log import get_logger
 from piker.brokers._util import (
     DataUnavailable,
+    get_logger,
 )
 
 from .api import (
@@ -78,7 +78,7 @@ from .venues import (
     get_api_eps,
 )
 
-log = get_logger(name=__name__)
+log = get_logger('piker.brokers.binance')
 
 
 class L1(Struct):
@@ -102,13 +102,12 @@ class AggTrade(Struct, frozen=True):
     a: int  # Aggregate trade ID
     p: float  # Price
     q: float  # Quantity with all the market trades
+    nq: float # Normal quantity without the trades involving RPI orders
     f: int  # First trade ID
     l: int  # noqa Last trade ID
     T: int  # Trade time
     m: bool  # Is the buyer the market maker?
-    M: bool|None = None  # Ignore
+    M: bool | None = None  # Ignore
-    nq: float|None = None # Normal quantity without the trades involving RPI orders
-    # ^XXX https://developers.binance.com/docs/derivatives/change-log#2025-12-29
 
 
 async def stream_messages(
@@ -237,8 +236,8 @@ async def open_history_client(
 
         async def get_ohlc(
             timeframe: float,
-            end_dt: datetime|None = None,
+            end_dt: datetime | None = None,
-            start_dt: datetime|None = None,
+            start_dt: datetime | None = None,
 
         ) -> tuple[
             np.ndarray,
@@ -275,15 +274,9 @@ async def open_history_client(
                     f'{times}'
                 )
 
-            # XXX, debug any case where the latest 1m bar we get is
-            # already another "sample's-step-old"..
             if end_dt is None:
                 inow: int = round(time.time())
-                if (
+                if (inow - times[-1]) > 60:
-                    _time_step := (inow - times[-1])
-                    >
-                    timeframe * 2
-                ):
                     await tractor.pause()
 
             start_dt = from_timestamp(times[0])
@@ -297,7 +290,7 @@ async def open_history_client(
 async def get_mkt_info(
     fqme: str,
 
-) -> tuple[MktPair, Pair]|None:
+) -> tuple[MktPair, Pair] | None:
 
     # uppercase since kraken bs_mktid is always upper
     if 'binance' not in fqme.lower():
@@ -374,7 +367,7 @@ async def get_mkt_info(
         if 'futes' in mkt_mode:
             assert isinstance(pair, FutesPair)
 
-        dst: Asset|None = assets.get(pair.bs_dst_asset)
+        dst: Asset | None = assets.get(pair.bs_dst_asset)
         if (
             not dst
             # TODO: a known asset DNE list?
@@ -433,7 +426,7 @@ async def subscribe(
     # might get ack from ws server, or maybe some
     # other msg still in transit..
     res = await ws.recv_msg()
-    subid: str|None = res.get('id')
+    subid: str | None = res.get('id')
     if subid:
         assert res['id'] == subid
 

piker/brokers/cli.py

@@ -27,12 +27,14 @@ import click
 import trio
 import tractor
 
-from piker.cli import cli
+from ..cli import cli
-from piker import watchlists as wl
+from .. import watchlists as wl
-from piker.log import (
+from ..log import (
     colorize_json,
+)
+from ._util import (
+    log,
     get_console_log,
-    get_logger,
 )
 from ..service import (
     maybe_spawn_brokerd,
@@ -43,15 +45,12 @@ from ..brokers import (
     get_brokermod,
     data,
 )
-
-log = get_logger(
-    name=__name__,
-)
-
 DEFAULT_BROKER = 'binance'
+
 _config_dir = click.get_app_dir('piker')
 _watchlists_data_path = os.path.join(_config_dir, 'watchlists.json')
 
+
 OK = '\033[92m'
 WARNING = '\033[93m'
 FAIL = '\033[91m'
@@ -346,10 +345,7 @@ def contracts(ctx, loglevel, broker, symbol, ids):
 
     '''
     brokermod = get_brokermod(broker)
-    get_console_log(
+    get_console_log(loglevel)
-        level=loglevel,
-        name=__name__,
-    )
 
     contracts = trio.run(partial(core.contracts, brokermod, symbol))
     if not ids:
@@ -481,12 +477,11 @@ def search(
     # the `piker --pdb` XD ..
     # -[ ] pull from the parent click ctx's values..dumdum
     # assert pdb
-    loglevel: str = config['loglevel']
 
     # define tractor entrypoint
     async def main(func):
         async with maybe_open_pikerd(
-            loglevel=loglevel,
+            loglevel=config['loglevel'],
             debug_mode=pdb,
         ):
             return await func()
@@ -499,7 +494,6 @@ def search(
                 core.symbol_search,
                 brokermods,
                 pattern,
-                loglevel=loglevel,
             ),
         )
 

piker/brokers/core.py

@@ -28,14 +28,12 @@ from typing import (
 
 import trio
 
-from piker.log import get_logger
+from ._util import log
 from . import get_brokermod
 from ..service import maybe_spawn_brokerd
 from . import open_cached_client
 from ..accounting import MktPair
 
-log = get_logger(name=__name__)
-
 
 async def api(brokername: str, methname: str, **kwargs) -> dict:
     '''
@@ -149,7 +147,6 @@ async def search_w_brokerd(
 async def symbol_search(
     brokermods: list[ModuleType],
     pattern: str,
-    loglevel: str = 'warning',
     **kwargs,
 
 ) -> dict[str, dict[str, dict[str, Any]]]:
@@ -179,7 +176,6 @@ async def symbol_search(
                 '_infect_asyncio',
                 False,
             ),
-            loglevel=loglevel
         ) as portal:
 
             results.append((

piker/brokers/data.py

@@ -41,15 +41,12 @@ import tractor
 from tractor.experimental import msgpub
 from async_generator import asynccontextmanager
 
-from piker.log import(
+from ._util import (
-    get_logger,
+    log,
     get_console_log,
 )
 from . import get_brokermod
 
-log = get_logger(
-    name='piker.brokers.binance',
-)
 
 async def wait_for_network(
     net_func: Callable,
@@ -246,10 +243,7 @@ async def start_quote_stream(
 
     '''
     # XXX: why do we need this again?
-    get_console_log(
+    get_console_log(tractor.current_actor().loglevel)
-        level=tractor.current_actor().loglevel,
-        name=__name__,
-    )
 
     # pull global vars from local actor
     symbols = list(symbols)

piker/brokers/ib/_util.py

@@ -34,13 +34,13 @@ import subprocess
 
 import tractor
 
-from piker.log import get_logger
+from piker.brokers._util import get_logger
 
 if TYPE_CHECKING:
     from .api import Client
     import i3ipc
 
-log = get_logger(name=__name__)
+log = get_logger('piker.brokers.ib')
 
 _reset_tech: Literal[
     'vnc',
@@ -250,9 +250,7 @@ async def vnc_click_hack(
         'connection': 'r'
     }[reset_type]
 
-    with tractor.devx.open_crash_handler(
+    with tractor.devx.open_crash_handler():
-        ignore={TimeoutError,},
-    ):
         client = await AsyncVNCClient.connect(
             VNCConfig(
                 host=host,
@@ -326,20 +324,14 @@ def i3ipc_fin_wins_titled(
     )
 
 
+
 def i3ipc_xdotool_manual_click_hack() -> None:
     '''
     Do the data reset hack but expecting a local X-window using `xdotool`.
 
     '''
     focussed, matches = i3ipc_fin_wins_titled()
-    try:
+    orig_win_id = focussed.window
-        orig_win_id = focussed.window
-    except AttributeError:
-        # XXX if .window cucks we prolly aren't intending to
-        # use this and/or just woke up from suspend..
-        log.exception('xdotool invalid usage ya ??\n')
-        return
-
     try:
         for name, con in matches:
             print(f'Resetting data feed for {name}')
@@ -387,3 +379,99 @@ def i3ipc_xdotool_manual_click_hack() -> None:
         ])
     except subprocess.TimeoutExpired:
         log.exception('xdotool timed out?')
+
+
+
+def is_current_time_in_range(
+    start_dt: datetime,
+    end_dt: datetime,
+) -> bool:
+    '''
+    Check if current time is within the datetime range.
+
+    Use any/the-same timezone as provided by `start_dt.tzinfo` value
+    in the range.
+
+    '''
+    now: datetime = datetime.now(start_dt.tzinfo)
+    return start_dt <= now <= end_dt
+
+
+# TODO, put this into `._util` and call it from here!
+#
+# NOTE, this was generated by @guille from a gpt5 prompt
+# and was originally thot to be needed before learning about
+# `ib_insync.contract.ContractDetails._parseSessions()` and
+# it's downstream meths..
+#
+# This is still likely useful to keep for now to parse the
+# `.tradingHours: str` value manually if we ever decide
+# to move off `ib_async` and implement our own `trio`/`anyio`
+# based version Bp
+#
+# >attempt to parse the retarted ib "time stampy thing" they
+# >do for "venue hours" with this.. written by
+# >gpt5-"thinking",
+#
+
+
+def parse_trading_hours(
+    spec: str,
+    tz: TzInfo|None = None
+) -> dict[
+    date,
+    tuple[datetime, datetime]
+]|None:
+    '''
+    Parse venue hours like:
+    'YYYYMMDD:HHMM-YYYYMMDD:HHMM;YYYYMMDD:CLOSED;...'
+
+    Returns `dict[date] = (open_dt, close_dt)` or `None` if
+    closed.
+
+    '''
+    if (
+        not isinstance(spec, str)
+        or
+        not spec
+    ):
+        raise ValueError('spec must be a non-empty string')
+
+    out: dict[
+        date,
+        tuple[datetime, datetime]
+    ]|None = {}
+
+    for part in (p.strip() for p in spec.split(';') if p.strip()):
+        if part.endswith(':CLOSED'):
+            day_s, _ = part.split(':', 1)
+            d = datetime.strptime(day_s, '%Y%m%d').date()
+            out[d] = None
+            continue
+
+        try:
+            start_s, end_s = part.split('-', 1)
+            start_dt = datetime.strptime(start_s, '%Y%m%d:%H%M')
+            end_dt = datetime.strptime(end_s, '%Y%m%d:%H%M')
+        except ValueError as exc:
+            raise ValueError(f'invalid segment: {part}') from exc
+
+        if tz is not None:
+            start_dt = start_dt.replace(tzinfo=tz)
+            end_dt = end_dt.replace(tzinfo=tz)
+
+        out[start_dt.date()] = (start_dt, end_dt)
+
+    return out
+
+
+# ORIG desired usage,
+#
+# TODO, for non-drunk tomorrow,
+# - call above fn and check that `output[today] is not None`
+# trading_hrs: dict = parse_trading_hours(
+#     details.tradingHours
+# )
+# liq_hrs: dict = parse_trading_hours(
+#     details.liquidHours
+    # )

piker/brokers/ib/api.py

@@ -50,11 +50,10 @@ import tractor
 from tractor import to_asyncio
 from tractor import trionics
 from pendulum import (
+    from_timestamp,
     DateTime,
     Duration,
     duration as mk_duration,
-    from_timestamp,
-    Interval,
 )
 from eventkit import Event
 from ib_insync import (
@@ -92,15 +91,10 @@ from .symbols import (
     _exch_skip_list,
     _futes_venues,
 )
-from ...log import get_logger
+from ._util import (
-from .venues import (
+    log,
-    is_venue_open,
+    # only for the ib_sync internal logging
-    sesh_times,
+    get_logger,
-    is_venue_closure,
-)
-
-log = get_logger(
-    name=__name__,
 )
 
 _bar_load_dtype: list[tuple[str, type]] = [
@@ -186,7 +180,7 @@ class NonShittyIB(IB):
         # override `ib_insync` internal loggers so we can see wtf
         # it's doing..
         self._logger = get_logger(
-            name=__name__,
+            'ib_insync.ib',
         )
         self._createEvents()
 
@@ -194,7 +188,7 @@ class NonShittyIB(IB):
         self.wrapper = NonShittyWrapper(self)
         self.client = ib_client.Client(self.wrapper)
         self.client._logger = get_logger(
-            name='ib_insync.client',
+            'ib_insync.client',
         )
 
         # self.errorEvent += self._onError
@@ -266,16 +260,6 @@ def remove_handler_on_err(
         event.disconnect(handler)
 
 
-# (originally?) i thot that,
-# > "EST in ISO 8601 format is required.."
-#
-# XXX, but see `ib_async`'s impl,
-# - `ib_async.ib.IB.reqHistoricalDataAsync()`
-# - `ib_async.util.formatIBDatetime()`
-# below is EPOCH.
-_iso8601_epoch_in_est: str = "1970-01-01T00:00:00.000000-05:00"
-
-
 class Client:
     '''
     IB wrapped for our broker backend API.
@@ -349,11 +333,9 @@ class Client:
         self,
         fqme: str,
 
-        # EST in ISO 8601 format is required..
+        # EST in ISO 8601 format is required... below is EPOCH
-        # XXX, see `ib_async.ib.IB.reqHistoricalDataAsync()`
+        start_dt: datetime|str = "1970-01-01T00:00:00.000000-05:00",
-        # below is EPOCH.
+        end_dt: datetime|str = "",
-        start_dt: datetime|None = None,  # _iso8601_epoch_in_est,
-        end_dt: datetime|None = None,
 
         # ohlc sample period in seconds
         sample_period_s: int = 1,
@@ -364,17 +346,9 @@ class Client:
 
         **kwargs,
 
-    ) -> tuple[
+    ) -> tuple[BarDataList, np.ndarray, Duration]:
-        BarDataList,
-        np.ndarray,
-        Duration,
-    ]:
         '''
-        Retreive the `fqme`'s OHLCV-bars for the time-range "until `end_dt`".
+        Retreive OHLCV bars for a fqme over a range to the present.
-
-        Notes:
-        - IB's api doesn't support a `start_dt` (which is why default
-          is null) so we only use it for bar-frame duration checking.
 
         '''
         # See API docs here:
@@ -389,19 +363,13 @@ class Client:
 
         dt_duration: Duration = (
             duration
-            or
+            or default_dt_duration
-            default_dt_duration
         )
 
         # TODO: maybe remove all this?
         global _enters
-        if end_dt is None:
+        if not end_dt:
-            end_dt: str = ''
+            end_dt = ''
-
-        else:
-            est_end_dt = end_dt.in_tz('EST')
-            if est_end_dt != end_dt:
-                breakpoint()
 
         _enters += 1
 
@@ -470,116 +438,58 @@ class Client:
                 + query_info
             )
 
-            # TODO: we could maybe raise `NoData` instead if we
+            # TODO: we could maybe raise ``NoData`` instead if we
             # rewrite the method in the first case?
             # right now there's no way to detect a timeout..
             return [], np.empty(0), dt_duration
 
         log.info(query_info)
-
-        # ------ GAP-DETECTION ------
         # NOTE XXX: ensure minimum duration in bars?
         # => recursively call this method until we get at least as
         #   many bars such that they sum in aggregate to the the
         #   desired total time (duration) at most.
         #  - if you query over a gap and get no data
         #    that may short circuit the history
-        if end_dt:
+        if (
+            # XXX XXX XXX
+            # => WHY DID WE EVEN NEED THIS ORIGINALLY!? <=
+            # XXX XXX XXX
+            False
+            and end_dt
+        ):
             nparr: np.ndarray = bars_to_np(bars)
             times: np.ndarray = nparr['time']
             first: float = times[0]
-            last: float = times[-1]
+            tdiff: float = times[-1] - first
-            # frame_dur: float = times[-1] - first
-
-            details: ContractDetails = (
-                await self.ib.reqContractDetailsAsync(contract)
-            )[0]
-            # convert to makt-native tz
-            tz: str = details.timeZoneId
-            end_dt = end_dt.in_tz(tz)
-            first_dt: DateTime = from_timestamp(first).in_tz(tz)
-            last_dt: DateTime = from_timestamp(last).in_tz(tz)
-            tdiff: int = (
-                last_dt
-                -
-                first_dt
-            ).in_seconds() + sample_period_s
-            _open_now: bool = is_venue_open(
-                con_deats=details,
-            )
-
-            # XXX, do gap detections.
-            has_closure_gap: bool = False
-            if (
-                last_dt.add(seconds=sample_period_s)
-                <
-                end_dt
-            ):
-                open_time, close_time = sesh_times(details)
-                # XXX, always calc gap in mkt-venue-local timezone
-                gap: Interval = end_dt - last_dt
-                if not (
-                    has_closure_gap := is_venue_closure(
-                    gap=gap,
-                    con_deats=details,
-                    time_step_s=sample_period_s,
-                )):
-                    log.warning(
-                        f'Invalid non-closure gap for {fqme!r} ?!?\n'
-                        f'is-open-now: {_open_now}\n'
-                        f'\n'
-                        f'{gap}\n'
-                    )
-                    log.warning(
-                        f'Detected NON venue-closure GAP ??\n'
-                        f'{gap}\n'
-                    )
-                    breakpoint()
-                else:
-                    assert has_closure_gap
-                    log.debug(
-                        f'Detected venue closure gap (weekend),\n'
-                        f'{gap}\n'
-                    )
 
             if (
-                start_dt is None
+                # len(bars) * sample_period_s) < dt_duration.in_seconds()
-                and (
+                tdiff < dt_duration.in_seconds()
-                    tdiff
+                # and False
-                    <
-                    dt_duration.in_seconds()
-                )
-                and
-                not has_closure_gap
             ):
-                log.error(
+                end_dt: DateTime = from_timestamp(first)
+                log.warning(
                     f'Frame result was shorter then {dt_duration}!?\n'
+                    'Recursing for more bars:\n'
                     f'end_dt: {end_dt}\n'
                     f'dt_duration: {dt_duration}\n'
-                    # f'\n'
-                    # f'Recursing for more bars:\n'
                 )
-                # XXX, debug!
+                (
-                breakpoint()
+                    r_bars,
-                # XXX ? TODO? recursively try to re-request?
+                    r_arr,
-                # => i think *NO* right?
+                    r_duration,
-                #
+                ) = await self.bars(
-                # (
+                    fqme,
-                #     r_bars,
+                    start_dt=start_dt,
-                #     r_arr,
+                    end_dt=end_dt,
-                #     r_duration,
+                    sample_period_s=sample_period_s,
-                # ) = await self.bars(
-                #     fqme,
-                #     start_dt=start_dt,
-                #     end_dt=end_dt,
-                #     sample_period_s=sample_period_s,
 
-                #     # TODO: make a table for Duration to
+                    # TODO: make a table for Duration to
-                #     # the ib str values in order to use this?
+                    # the ib str values in order to use this?
-                #     # duration=duration,
+                    # duration=duration,
-                # )
+                )
-                # r_bars.extend(bars)
+                r_bars.extend(bars)
-                # bars = r_bars
+                bars = r_bars
 
         nparr: np.ndarray = bars_to_np(bars)
 
@@ -874,16 +784,9 @@ class Client:
         # crypto$
         elif exch == 'PAXOS':  # btc.paxos
             con = Crypto(
-                symbol=symbol.upper(),
+                symbol=symbol,
-                currency='USD',
+                currency=currency,
-                exchange='PAXOS',
             )
-            # XXX, on `ib_insync` when first tried this,
-            # > Error 10299, reqId 141: Expected what to show is
-            # > AGGTRADES, please use that instead of TRADES.,
-            # > contract: Crypto(conId=479624278, symbol='BTC',
-            # > exchange='PAXOS', currency='USD',
-            # > localSymbol='BTC.USD', tradingClass='BTC')
 
         # stonks
         else:
@@ -1284,7 +1187,7 @@ async def load_aio_clients(
     # the API TCP in `ib_insync` connection can be flaky af so instead
     # retry a few times to get the client going..
     connect_retries: int = 3,
-    connect_timeout: float = 30,  # in case a remote-host
+    connect_timeout: float = 10,
     disconnect_on_exit: bool = True,
 
 ) -> dict[str, Client]:

piker/brokers/ib/broker.py

@@ -50,10 +50,6 @@ from ib_insync.objects import (
 )
 
 from piker import config
-from piker.log import (
-    get_logger,
-    get_console_log,
-)
 from piker.types import Struct
 from piker.accounting import (
     Position,
@@ -81,6 +77,7 @@ from piker.clearing._messages import (
     BrokerdFill,
     BrokerdError,
 )
+from ._util import log
 from .api import (
     _accounts2clients,
     get_config,
@@ -98,10 +95,6 @@ from .ledger import (
     update_ledger_from_api_trades,
 )
 
-log = get_logger(
-    name=__name__,
-)
-
 
 def pack_position(
     pos: IbPosition,
@@ -369,10 +362,6 @@ async def update_and_audit_pos_msg(
         size=ibpos.position,
 
         avg_price=pikerpos.ppu,
-
-        # XXX ensures matching even if multiple venue-names
-        # in `.bs_fqme`, likely from txn records..
-        bs_mktid=mkt.bs_mktid,
     )
 
     ibfmtmsg: str = pformat(ibpos._asdict())
@@ -441,8 +430,7 @@ async def aggr_open_orders(
 
 ) -> None:
     '''
-    Collect all open orders from client and fill in `order_msgs:
+    Collect all open orders from client and fill in `order_msgs: list`.
-    list`.
 
     '''
     trades: list[Trade] = client.ib.openTrades()
@@ -543,15 +531,9 @@ class IbAcnt(Struct):
 @tractor.context
 async def open_trade_dialog(
     ctx: tractor.Context,
-    loglevel: str = 'warning',
 
 ) -> AsyncIterator[dict[str, Any]]:
 
-    get_console_log(
-        level=loglevel,
-        name=__name__,
-    )
-
     # task local msg dialog tracking
     flows = OrderDialogs()
     accounts_def = config.load_accounts(['ib'])

piker/brokers/ib/feed.py

@@ -56,11 +56,11 @@ from piker.brokers._util import (
     NoData,
     DataUnavailable,
 )
-from piker.log import get_logger
 from .api import (
     # _adhoc_futes_set,
     Client,
     con2fqme,
+    log,
     load_aio_clients,
     MethodProxy,
     open_client_proxies,
@@ -69,18 +69,15 @@ from .api import (
     Contract,
     RequestError,
 )
-from .venues import is_venue_open
 from ._util import (
     data_reset_hack,
+    is_current_time_in_range,
 )
 from .symbols import get_mkt_info
 
 if TYPE_CHECKING:
     from trio._core._run import Task
 
-log = get_logger(
-    name=__name__,
-)
 
 # XXX NOTE: See available types table docs:
 # https://interactivebrokers.github.io/tws-api/tick_types.html
@@ -181,8 +178,8 @@ async def open_history_client(
 
         async def get_hist(
             timeframe: float,
-            end_dt: datetime|None = None,
+            end_dt: datetime | None = None,
-            start_dt: datetime|None = None,
+            start_dt: datetime | None = None,
 
         ) -> tuple[np.ndarray, str]:
 
@@ -206,8 +203,7 @@ async def open_history_client(
             latency = time.time() - query_start
             if (
                 not timedout
-                # and
+                # and latency <= max_timeout
-                # latency <= max_timeout
             ):
                 count += 1
                 mean += latency / count
@@ -223,10 +219,8 @@ async def open_history_client(
                 )
                 if (
                     end_dt
-                    and
+                    and head_dt
-                    head_dt
+                    and end_dt <= head_dt
-                    and
-                    end_dt <= head_dt
                 ):
                     raise DataUnavailable(
                         f'First timestamp is {head_dt}\n'
@@ -268,43 +262,12 @@ async def open_history_client(
             vlm = bars_array['volume']
             vlm[vlm < 0] = 0
 
-            # XXX, if a start-limit was passed ensure we only
+            return bars_array, first_dt, last_dt
-            # return history that far back!
-            if (
-                start_dt
-                and
-                first_dt < start_dt
-            ):
-                trimmed_bars = bars_array[
-                    bars_array['time'] >= start_dt.timestamp()
-                ]
-                if (
-                    trimmed_first_dt := from_timestamp(trimmed_bars['time'][0])
-                    !=
-                    start_dt
-                ):
-                    # TODO! rm this once we're more confident it never hits!
-                    # breakpoint()
-                    raise RuntimeError(
-                        f'OHLC-bars array start is gt `start_dt` limit !!\n'
-                        f'start_dt: {start_dt}\n'
-                        f'first_dt: {first_dt}\n'
-                        f'trimmed_first_dt: {trimmed_first_dt}\n'
-                    )
-
-                # XXX, overwrite with start_dt-limited frame
-                bars_array = trimmed_bars
-
-            return (
-                bars_array,
-                first_dt,
-                last_dt,
-            )
 
         # TODO: it seems like we can do async queries for ohlc
         # but getting the order right still isn't working and I'm not
         # quite sure why.. needs some tinkering and probably
-        # a lookthrough of the `ib_insync` machinery, for eg. maybe
+        # a lookthrough of the ``ib_insync`` machinery, for eg. maybe
         # we have to do the batch queries on the `asyncio` side?
         yield (
             get_hist,
@@ -427,13 +390,14 @@ _failed_resets: int = 0
 
 
 async def get_bars(
+
     proxy: MethodProxy,
     fqme: str,
     timeframe: int,
 
     # blank to start which tells ib to look up the latest datum
-    end_dt: datetime|None = None,
+    end_dt: str = '',
-    start_dt: datetime|None = None,
+    start_dt: str | None = '',
 
     # TODO: make this more dynamic based on measured frame rx latency?
     # how long before we trigger a feed reset (seconds)
@@ -487,9 +451,6 @@ async def get_bars(
                     dt_duration,
                 ) = await proxy.bars(
                     fqme=fqme,
-                    # XXX TODO! LOL we're not using this and IB dun
-                    # support it anyway..
-                    # start_dt=start_dt,
                     end_dt=end_dt,
                     sample_period_s=timeframe,
 
@@ -740,7 +701,7 @@ async def _setup_quote_stream(
         # '294',  # Trade rate / minute
         # '295',  # Vlm rate / minute
     ),
-    contract: Contract|None = None,
+    contract: Contract | None = None,
 
 ) -> trio.abc.ReceiveChannel:
     '''
@@ -762,12 +723,7 @@ async def _setup_quote_stream(
         # XXX since this is an `asyncio.Task`, we must use
         # tractor.pause_from_sync()
 
-        (
+        caccount_name, client = get_preferred_data_client(accts2clients)
-            _account_name,
-            client,
-        ) = get_preferred_data_client(
-            accts2clients,
-        )
         contract = (
             contract
             or
@@ -1102,9 +1058,14 @@ async def stream_quotes(
         )
 
         # is venue active rn?
-        venue_is_open: bool = is_venue_open(
+        venue_is_open: bool = any(
-            con_deats=details,
+            is_current_time_in_range(
+                start_dt=sesh.start,
+                end_dt=sesh.end,
+            )
+            for sesh in details.tradingSessions()
         )
+
         init_msg = FeedInit(mkt_info=mkt)
 
         # NOTE, tell sampler (via config) to skip vlm summing for dst
@@ -1121,7 +1082,6 @@ async def stream_quotes(
 
         con: Contract = details.contract
         first_ticker: Ticker|None = None
-        first_quote: dict[str, Any] = {}
 
         timeout: float = 1.6
         with trio.move_on_after(timeout) as quote_cs:
@@ -1174,14 +1134,15 @@ async def stream_quotes(
                 first_quote,
             ))
 
+            # it's not really live but this will unblock
+            # the brokerd feed task to tell the ui to update?
+            feed_is_live.set()
+
             # block and let data history backfill code run.
             # XXX obvi given the venue is closed, we never expect feed
             # to come up; a taskc should be the only way to
             # terminate this task.
             await trio.sleep_forever()
-            #
-            # ^^XXX^^TODO! INSTEAD impl a `trio.sleep()` for the
-            # duration until the venue opens!!
 
         # ?TODO, we could instead spawn a task that waits on a feed
         # to start and let it wait indefinitely..instead of this
@@ -1205,9 +1166,6 @@ async def stream_quotes(
             'Rxed init quote:\n'
             f'{pformat(first_quote)}'
         )
-        # signal `.data.feed` layer that mkt quotes are LIVE
-        feed_is_live.set()
-
         cs: trio.CancelScope|None = None
         startup: bool = True
         iter_quotes: trio.abc.Channel
@@ -1255,12 +1213,55 @@ async def stream_quotes(
                     tn.start_soon(reset_on_feed)
 
                     async with aclosing(iter_quotes):
+                        # if syminfo.get('no_vlm', False):
+                        if not init_msg.shm_write_opts['has_vlm']:
+
+                            # generally speaking these feeds don't
+                            # include vlm data.
+                            atype: str = mkt.dst.atype
+                            log.info(
+                                f'No-vlm {mkt.fqme}@{atype}, skipping quote poll'
+                            )
+
+                        else:
+                            # wait for real volume on feed (trading might be
+                            # closed)
+                            while True:
+                                ticker = await iter_quotes.receive()
+
+                                # for a real volume contract we rait for
+                                # the first "real" trade to take place
+                                if (
+                                    # not calc_price
+                                    # and not ticker.rtTime
+                                    False
+                                    # not ticker.rtTime
+                                ):
+                                    # spin consuming tickers until we
+                                    # get a real market datum
+                                    log.debug(f"New unsent ticker: {ticker}")
+                                    continue
+
+                                else:
+                                    log.debug("Received first volume tick")
+                                    # ugh, clear ticks since we've
+                                    # consumed them (ahem, ib_insync is
+                                    # truly stateful trash)
+                                    # ticker.ticks = []
+
+                                    # XXX: this works because we don't use
+                                    # ``aclosing()`` above?
+                                    break
+
+                            quote = normalize(ticker)
+                            log.debug(f"First ticker received {quote}")
+
                         # tell data-layer spawner-caller that live
                         # quotes are now active desptie not having
                         # necessarily received a first vlm/clearing
                         # tick.
                         ticker = await iter_quotes.receive()
-                        quote = normalize(ticker)
+                        feed_is_live.set()
                         fqme: str = quote['fqme']
                         await send_chan.send({fqme: quote})
 

piker/brokers/ib/ledger.py

@@ -44,7 +44,6 @@ from ib_insync import (
     CommissionReport,
 )
 
-from piker.log import get_logger
 from piker.types import Struct
 from piker.data import (
     SymbologyCache,
@@ -58,6 +57,7 @@ from piker.accounting import (
     iter_by_dt,
 )
 from ._flex_reports import parse_flex_dt
+from ._util import log
 
 if TYPE_CHECKING:
     from .api import (
@@ -65,9 +65,6 @@ if TYPE_CHECKING:
         MethodProxy,
     )
 
-log = get_logger(
-    name=__name__,
-)
 
 tx_sort: Callable = partial(
     iter_by_dt,

piker/brokers/ib/symbols.py

@@ -42,7 +42,10 @@ from piker.accounting import (
 from piker._cacheables import (
     async_lifo_cache,
 )
-from piker.log import get_logger
+
+from ._util import (
+    log,
+)
 
 if TYPE_CHECKING:
     from .api import (
@@ -50,10 +53,6 @@ if TYPE_CHECKING:
         Client,
     )
 
-log = get_logger(
-    name=__name__,
-)
-
 _futes_venues = (
     'GLOBEX',
     'NYMEX',
@@ -135,7 +134,7 @@ _adhoc_fiat_set = set((
 
 # manually discovered tick discrepancies,
 # onl god knows how or why they'd cuck these up..
-_adhoc_mkt_infos: dict[int|str, dict] = {
+_adhoc_mkt_infos: dict[int | str, dict] = {
     'vtgn.nasdaq': {'price_tick': Decimal('0.01')},
 }
 
@@ -489,7 +488,8 @@ def con2fqme(
 @async_lifo_cache()
 async def get_mkt_info(
     fqme: str,
-    proxy: MethodProxy|None = None,
+
+    proxy: MethodProxy | None = None,
 
 ) -> tuple[MktPair, ibis.ContractDetails]:
 
@@ -550,7 +550,7 @@ async def get_mkt_info(
         size_tick: Decimal = Decimal(
             str(details.minSize).rstrip('0')
         )
-        # ?TODO, there is also the Contract.sizeIncrement, bt wtf is it?
+        # |-> TODO: there is also the Contract.sizeIncrement, bt wtf is it?
 
     # NOTE: this is duplicate from the .broker.norm_trade_records()
     # routine, we should factor all this parsing somewhere..

piker/brokers/ib/venues.py

@@ -1,312 +0,0 @@
-# piker: trading gear for hackers
-# Copyright (C) Tyler Goodlet (in stewardship for pikers)
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-'''
-(Multi-)venue mgmt helpers.
-
-IB generally supports all "legacy" trading venues, those mostly owned
-by ICE and friends.
-
-'''
-from __future__ import annotations
-from datetime import (  # noqa
-    datetime,
-    date,
-    tzinfo as TzInfo,
-)
-from typing import (
-    Iterator,
-    TYPE_CHECKING,
-)
-
-import exchange_calendars as xcals
-from pendulum import (
-    now,
-    Duration,
-    Interval,
-    Time,
-)
-
-if TYPE_CHECKING:
-    from ib_insync import (
-        TradingSession,
-        ContractDetails,
-    )
-    from exchange_calendars.exchange_calendars import (
-        ExchangeCalendar,
-    )
-    from pandas import (
-        # DatetimeIndex,
-        TimeDelta,
-        Timestamp,
-    )
-
-
-def has_weekend(
-    period: Interval,
-) -> bool:
-    '''
-    Predicate to for a period being within
-    days 6->0 (sat->sun).
-
-    '''
-    has_weekend: bool = False
-    for dt in period:
-        if dt.day_of_week in [0, 6]: # 0=Sunday, 6=Saturday
-            has_weekend = True
-            break
-
-    return has_weekend
-
-
-def has_holiday(
-    con_deats: ContractDetails,
-    period: Interval,
-) -> bool:
-    '''
-    Using the `exchange_calendars` lib detect if a time-gap `period`
-    is contained in a known "cash hours" closure.
-
-    '''
-    tz: str = con_deats.timeZoneId
-    exch: str = con_deats.contract.primaryExchange
-    cal: ExchangeCalendar = xcals.get_calendar(exch)
-    end: datetime = period.end
-    # _start: datetime = period.start
-    # ?TODO, can rm ya?
-    # => not that useful?
-    # dti: DatetimeIndex = cal.sessions_in_range(
-    #     _start.date(),
-    #     end.date(),
-    # )
-    prev_close: Timestamp = cal.previous_close(
-        end.date()
-    ).tz_convert(tz)
-    prev_open: Timestamp = cal.previous_open(
-        end.date()
-    ).tz_convert(tz)
-    # now do relative from prev_ values ^
-    # to get the next open which should match
-    # "contain" the end of the gap.
-    next_open: Timestamp = cal.next_open(
-        prev_open,
-    ).tz_convert(tz)
-    next_open: Timestamp = cal.next_open(
-        prev_open,
-    ).tz_convert(tz)
-    _next_close: Timestamp = cal.next_close(
-        prev_close
-    ).tz_convert(tz)
-    cash_gap: TimeDelta = next_open - prev_close
-    is_holiday_gap = (
-        cash_gap
-        > 
-        period
-    )
-    # XXX, debug
-    # breakpoint()
-    return is_holiday_gap
-
-
-def is_current_time_in_range(
-    sesh: Interval,
-    when: datetime|None = None,
-) -> bool:
-    '''
-    Check if current time is within the datetime range.
-
-    Use any/the-same timezone as provided by `start_dt.tzinfo` value
-    in the range.
-
-    '''
-    when: datetime = when or now()
-    return when in sesh
-
-
-def iter_sessions(
-    con_deats: ContractDetails,
-) -> Iterator[Interval]:
-    '''
-    Yield `pendulum.Interval`s for all
-    `ibas.ContractDetails.tradingSessions() -> TradingSession`s.
-
-    '''
-    sesh: TradingSession
-    for sesh in con_deats.tradingSessions():
-        yield Interval(*sesh)
-
-
-def sesh_times(
-    con_deats: ContractDetails,
-) -> tuple[Time, Time]:
-    '''
-    Based on the earliest trading session provided by the IB API,
-    get the (day-agnostic) times for the start/end.
-
-    '''
-    earliest_sesh: Interval = next(iter_sessions(con_deats))
-    return (
-        earliest_sesh.start.time(),
-        earliest_sesh.end.time(),
-    )
-    # ^?TODO, use `.diff()` to get point-in-time-agnostic period?
-    # https://pendulum.eustace.io/docs/#difference
-
-
-def is_venue_open(
-    con_deats: ContractDetails,
-    when: datetime|Duration|None = None,
-) -> bool:
-    '''
-    Check if market-venue is open during `when`, which defaults to
-    "now".
-
-    '''
-    sesh: Interval
-    for sesh in iter_sessions(con_deats):
-        if is_current_time_in_range(
-            sesh=sesh,
-            when=when,
-        ):
-            return True
-
-    return False
-
-
-def is_venue_closure(
-    gap: Interval,
-    con_deats: ContractDetails,
-    time_step_s: int,
-) -> bool:
-    '''
-    Check if a provided time-`gap` is just an (expected) trading
-    venue closure period.
-
-    '''
-    open: Time
-    close: Time
-    open, close = sesh_times(con_deats)
-
-    # ensure times are in mkt-native timezone
-    tz: str = con_deats.timeZoneId
-    start = gap.start.in_tz(tz)
-    start_t = start.time()
-    end = gap.end.in_tz(tz)
-    end_t = end.time()
-    if (
-        (
-            start_t in (
-                close,
-                close.subtract(seconds=time_step_s)
-            )
-            and 
-            end_t in (
-                open,
-                open.add(seconds=time_step_s),
-            )
-        )
-        or
-        has_weekend(gap)
-        or
-        has_holiday(
-            con_deats=con_deats,
-            period=gap,
-        )
-    ):
-        return True
-
-    # breakpoint()
-    return False
-
-
-# TODO, put this into `._util` and call it from here!
-#
-# NOTE, this was generated by @guille from a gpt5 prompt
-# and was originally thot to be needed before learning about
-# `ib_insync.contract.ContractDetails._parseSessions()` and
-# it's downstream meths..
-#
-# This is still likely useful to keep for now to parse the
-# `.tradingHours: str` value manually if we ever decide
-# to move off `ib_async` and implement our own `trio`/`anyio`
-# based version Bp
-#
-# >attempt to parse the retarted ib "time stampy thing" they
-# >do for "venue hours" with this.. written by
-# >gpt5-"thinking",
-#
-
-
-def parse_trading_hours(
-    spec: str,
-    tz: TzInfo|None = None
-) -> dict[
-    date,
-    tuple[datetime, datetime]
-]|None:
-    '''
-    Parse venue hours like:
-    'YYYYMMDD:HHMM-YYYYMMDD:HHMM;YYYYMMDD:CLOSED;...'
-
-    Returns `dict[date] = (open_dt, close_dt)` or `None` if
-    closed.
-
-    '''
-    if (
-        not isinstance(spec, str)
-        or
-        not spec
-    ):
-        raise ValueError('spec must be a non-empty string')
-
-    out: dict[
-        date,
-        tuple[datetime, datetime]
-    ]|None = {}
-
-    for part in (p.strip() for p in spec.split(';') if p.strip()):
-        if part.endswith(':CLOSED'):
-            day_s, _ = part.split(':', 1)
-            d = datetime.strptime(day_s, '%Y%m%d').date()
-            out[d] = None
-            continue
-
-        try:
-            start_s, end_s = part.split('-', 1)
-            start_dt = datetime.strptime(start_s, '%Y%m%d:%H%M')
-            end_dt = datetime.strptime(end_s, '%Y%m%d:%H%M')
-        except ValueError as exc:
-            raise ValueError(f'invalid segment: {part}') from exc
-
-        if tz is not None:
-            start_dt = start_dt.replace(tzinfo=tz)
-            end_dt = end_dt.replace(tzinfo=tz)
-
-        out[start_dt.date()] = (start_dt, end_dt)
-
-    return out
-
-
-# ORIG desired usage,
-#
-# TODO, for non-drunk tomorrow,
-# - call above fn and check that `output[today] is not None`
-# trading_hrs: dict = parse_trading_hours(
-#     details.tradingHours
-# )
-# liq_hrs: dict = parse_trading_hours(
-#     details.liquidHours
-    # )

piker/brokers/kraken/broker.py

@@ -62,12 +62,9 @@ from piker.clearing._messages import (
 from piker.brokers import (
     open_cached_client,
 )
-from piker.log import (
-    get_console_log,
-    get_logger,
-)
 from piker.data import open_symcache
 from .api import (
+    log,
     Client,
     BrokerError,
 )
@@ -81,8 +78,6 @@ from .ledger import (
     verify_balances,
 )
 
-log = get_logger(name=__name__)
-
 MsgUnion = Union[
     BrokerdCancel,
     BrokerdError,
@@ -436,15 +431,9 @@ def trades2pps(
 @tractor.context
 async def open_trade_dialog(
     ctx: tractor.Context,
-    loglevel: str = 'warning',
 
 ) -> AsyncIterator[dict[str, Any]]:
 
-    get_console_log(
-        level=loglevel,
-        name=__name__,
-    )
-
     async with (
         # TODO: maybe bind these together and deliver
         # a tuple from `.open_cached_client()`?

piker/brokers/questrade.py

@@ -50,19 +50,13 @@ from . import open_cached_client
 from piker._cacheables import async_lifo_cache
 from .. import config
 from ._util import resproc, BrokerError, SymbolNotFound
-from piker.log import (
+from ..log import (
     colorize_json,
+)
+from ._util import (
+    log,
     get_console_log,
 )
-from piker.log import (
-    get_logger,
-)
-
-
-log = get_logger(
-    name=__name__,
-)
-
 
 _use_practice_account = False
 _refresh_token_ep = 'https://{}login.questrade.com/oauth2/'
@@ -1211,10 +1205,7 @@ async def stream_quotes(
     # feed_type: str = 'stock',
 ) -> AsyncGenerator[str, Dict[str, Any]]:
     # XXX: required to propagate ``tractor`` loglevel to piker logging
-    get_console_log(
+    get_console_log(loglevel)
-        level=loglevel,
-        name=__name__,
-    )
 
     async with open_cached_client('questrade') as client:
         if feed_type == 'stock':

piker/brokers/robinhood.py

@@ -30,16 +30,9 @@ import asks
 from ._util import (
     resproc,
     BrokerError,
+    log,
 )
-from piker.calc import percent_change
+from ..calc import percent_change
-from piker.log import (
-    get_logger,
-)
-
-log = get_logger(
-    name=__name__,
-)
-
 
 _service_ep = 'https://api.robinhood.com'
 

piker/clearing/_client.py

@@ -215,7 +215,7 @@ async def relay_orders_from_sync_code(
 async def open_ems(
     fqme: str,
     mode: str = 'live',
-    loglevel: str = 'warning',
+    loglevel: str = 'error',
 
 ) -> tuple[
     OrderClient,  # client

piker/clearing/_ems.py

@@ -47,7 +47,6 @@ from tractor import trionics
 from ._util import (
     log,  # sub-sys logger
     get_console_log,
-    subsys,
 )
 from ..accounting._mktinfo import (
     unpack_fqme,
@@ -137,7 +136,7 @@ class DarkBook(Struct):
             tuple[
                 Callable[[float], bool],  # predicate
                 tuple[str, ...],  # tickfilter
-                dict|Order,  # cmd / msg type
+                dict | Order,  # cmd / msg type
 
                 # live submission constraint parameters
                 float,  # percent_away max price diff
@@ -279,7 +278,7 @@ async def clear_dark_triggers(
 
                     # remove exec-condition from set
                     log.info(f'Removing trigger for {oid}')
-                    trigger: tuple|None = execs.pop(oid, None)
+                    trigger: tuple | None = execs.pop(oid, None)
                     if not trigger:
                         log.warning(
                             f'trigger for {oid} was already removed!?'
@@ -337,8 +336,8 @@ async def open_brokerd_dialog(
     brokermod: ModuleType,
     portal: tractor.Portal,
     exec_mode: str,
-    fqme: str|None = None,
+    fqme: str | None = None,
-    loglevel: str|None = None,
+    loglevel: str | None = None,
 
 ) -> tuple[
     tractor.MsgStream,
@@ -352,21 +351,9 @@ async def open_brokerd_dialog(
     broker backend, configuration, or client code usage.
 
     '''
-    get_console_log(
-        level=loglevel,
-        name='clearing',
-    )
-    # enable `.accounting` console since normally used by
-    # each `brokerd`.
-    get_console_log(
-        level=loglevel,
-        name='piker.accounting',
-    )
     broker: str = brokermod.name
 
-    def mk_paper_ep(
+    def mk_paper_ep():
-        loglevel: str,
-    ):
         from . import _paper_engine as paper_mod
 
         nonlocal brokermod, exec_mode
@@ -401,7 +388,6 @@ async def open_brokerd_dialog(
     for ep_name in [
         'open_trade_dialog',  # probably final name?
         'trades_dialogue',  # legacy
-        # ^!TODO, rm this since all backends ported no ?!?
     ]:
         trades_endpoint = getattr(
             brokermod,
@@ -418,21 +404,17 @@ async def open_brokerd_dialog(
 
     if (
         trades_endpoint is not None
-        or
+        or exec_mode != 'paper'
-        exec_mode != 'paper'
     ):
         # open live brokerd trades endpoint
         open_trades_endpoint = portal.open_context(
             trades_endpoint,
-            loglevel=loglevel,
         )
 
     @acm
     async def maybe_open_paper_ep():
         if exec_mode == 'paper':
-            async with mk_paper_ep(
+            async with mk_paper_ep() as msg:
-                loglevel=loglevel,
-            ) as msg:
                 yield msg
                 return
 
@@ -443,9 +425,7 @@ async def open_brokerd_dialog(
             # runtime indication that the backend can't support live
             # order ctrl yet, so boot the paperboi B0
             if first == 'paper':
-                async with mk_paper_ep(
+                async with mk_paper_ep() as msg:
-                    loglevel=loglevel,
-                ) as msg:
                     yield msg
                     return
             else:
@@ -748,7 +728,6 @@ class Router(Struct):
             except (
                 trio.ClosedResourceError,
                 trio.BrokenResourceError,
-                tractor.TransportClosed,
             ):
                 to_remove.add(client_stream)
                 log.warning(
@@ -780,16 +759,12 @@ _router: Router = None
 @tractor.context
 async def _setup_persistent_emsd(
     ctx: tractor.Context,
-    loglevel: str|None = None,
+    loglevel: str | None = None,
 
 ) -> None:
 
     if loglevel:
-        _log = get_console_log(
+        get_console_log(loglevel)
-            level=loglevel,
-            name=subsys,
-        )
-        assert _log.name == 'piker.clearing'
 
     global _router
 
@@ -845,7 +820,7 @@ async def translate_and_relay_brokerd_events(
             f'Rx brokerd trade msg:\n'
             f'{fmsg}'
         )
-        status_msg: Status|None = None
+        status_msg: Status | None = None
 
         match brokerd_msg:
             # BrokerdPosition
@@ -1052,18 +1027,8 @@ async def translate_and_relay_brokerd_events(
                     )
 
                 if status == 'closed':
-                    log.info(
+                    log.info(f'Execution for {oid} is complete!')
-                        f'Execution is complete!\n'
+                    status_msg = book._active.pop(oid)
-                        f'oid: {oid!r}\n'
-                    )
-                    status_msg = book._active.pop(oid, None)
-                    if status_msg is None:
-                        log.warning(
-                            f'Order was already cleared from book ??\n'
-                            f'oid: {oid!r}\n'
-                            f'\n'
-                            f'Maybe the order cancelled before submitted ??\n'
-                        )
 
                 elif status == 'canceled':
                     log.cancel(f'Cancellation for {oid} is complete!')
@@ -1306,7 +1271,7 @@ async def process_client_order_cmds(
                 and status.resp == 'dark_open'
             ):
                 # remove from dark book clearing
-                entry: tuple|None = dark_book.triggers[fqme].pop(oid, None)
+                entry: tuple | None = dark_book.triggers[fqme].pop(oid, None)
                 if entry:
                     (
                         pred,
@@ -1587,18 +1552,19 @@ async def maybe_open_trade_relays(
 
 @tractor.context
 async def _emsd_main(
-    ctx: tractor.Context,   # becomes `ems_ctx` below
+    ctx: tractor.Context,
     fqme: str,
     exec_mode: str,  # ('paper', 'live')
     loglevel: str|None = None,
 
-) -> tuple[  # `ctx.started()` value!
+) -> tuple[
-    dict[  # positions
+    dict[
-        tuple[str, str],  # brokername, acctid
+        # brokername, acctid
+        tuple[str, str],
         list[BrokerdPosition],
     ],
-    list[str],  # accounts
+    list[str],
-    dict[str, Status],  # dialogs
+    dict[str, Status],
 ]:
     '''
     EMS (sub)actor entrypoint providing the execution management
@@ -1723,5 +1689,5 @@ async def _emsd_main(
                     if not client_streams:
                         log.warning(
                             f'Order dialog is not being monitored:\n'
-                            f'{oid!r} <-> {client_stream.chan.aid.reprol()}\n'
+                            f'{oid} ->\n{client_stream._ctx.chan.uid}'
                         )

piker/clearing/_messages.py

@@ -301,9 +301,6 @@ class BrokerdError(Struct):
 
 # TODO: yeah, so we REALLY need to completely deprecate
 # this and use the `.accounting.Position` msg-type instead..
-# -[ ] an alternative might be to add a `Position.summary() ->
-#   `PositionSummary`-msg that we generate since `Position` has a lot
-#   of fields by default we likely don't want to send over the wire?
 class BrokerdPosition(Struct):
     '''
     Position update event from brokerd.
@@ -316,4 +313,3 @@ class BrokerdPosition(Struct):
     avg_price: float
     currency: str = ''
     name: str = 'position'
-    bs_mktid: str|int|None = None

piker/clearing/_paper_engine.py

@@ -59,9 +59,9 @@ from piker.data import (
     open_symcache,
 )
 from piker.types import Struct
-from piker.log import (
+from ._util import (
+    log,  # sub-sys logger
     get_console_log,
-    get_logger,
 )
 from ._messages import (
     BrokerdCancel,
@@ -73,8 +73,6 @@ from ._messages import (
     BrokerdError,
 )
 
-log = get_logger(name=__name__)
-
 
 class PaperBoi(Struct):
     '''
@@ -552,18 +550,16 @@ _sells: defaultdict[
 
 @tractor.context
 async def open_trade_dialog(
+
     ctx: tractor.Context,
     broker: str,
-    fqme: str|None = None,  # if empty, we only boot broker mode
+    fqme: str | None = None,  # if empty, we only boot broker mode
     loglevel: str = 'warning',
 
 ) -> None:
 
-    # enable piker.clearing console log for *this* `brokerd` subactor
+    # enable piker.clearing console log for *this* subactor
-    get_console_log(
+    get_console_log(loglevel)
-        level=loglevel,
-        name=__name__,
-    )
 
     symcache: SymbologyCache
     async with open_symcache(get_brokermod(broker)) as symcache:

piker/clearing/_util.py

@@ -28,14 +28,12 @@ from ..log import (
 from piker.types import Struct
 subsys: str = 'piker.clearing'
 
-log = get_logger(
+log = get_logger(subsys)
-    name='piker.clearing',
-)
 
 # TODO, oof doesn't this ignore the `loglevel` then???
 get_console_log = partial(
     get_console_log,
-    name='clearing',
+    name=subsys,
 )
 
 

piker/cli/__init__.py

@@ -61,8 +61,7 @@ def load_trans_eps(
 
     if (
         network
-        and
+        and not maddrs
-        not maddrs
     ):
         # load network section and (attempt to) connect all endpoints
         # which are reachable B)
@@ -113,27 +112,31 @@ def load_trans_eps(
     default=None,
     help='Multiaddrs to bind or contact',
 )
+# @click.option(
+#     '--tsdb',
+#     is_flag=True,
+#     help='Enable local ``marketstore`` instance'
+# )
+# @click.option(
+#     '--es',
+#     is_flag=True,
+#     help='Enable local ``elasticsearch`` instance'
+# )
 def pikerd(
     maddr: list[str] | None,
     loglevel: str,
     tl: bool,
     pdb: bool,
+    # tsdb: bool,
+    # es: bool,
 ):
     '''
-    Start the "root service actor", `pikerd`, run it until
+    Spawn the piker broker-daemon.
-    cancellation.
-
-    This "root daemon" operates as the top most service-mngr and
-    subsys-as-subactor supervisor, think of it as the "init proc" of
-    any of any `piker` application or daemon-process tree.
 
     '''
     # from tractor.devx import maybe_open_crash_handler
     # with maybe_open_crash_handler(pdb=False):
-    log = get_console_log(
+    log = get_console_log(loglevel, name='cli')
-        level=loglevel,
-        with_tractor_log=tl,
-    )
 
     if pdb:
         log.warning((
@@ -234,14 +237,6 @@ def cli(
     regaddr: str,
 
 ) -> None:
-    '''
-    The "root" `piker`-cmd CLI endpoint.
-
-    NOTE, this def generally relies on and requires a sub-cmd to be
-    provided by the user, OW only a `--help` msg (listing said
-    subcmds) will be dumped to console.
-
-    '''
     if configdir is not None:
         assert os.path.isdir(configdir), f"`{configdir}` is not a valid path"
         config._override_config_dir(configdir)
@@ -300,50 +295,17 @@ def cli(
 @click.option('--tl', is_flag=True, help='Enable tractor logging')
 @click.argument('ports', nargs=-1, required=False)
 @click.pass_obj
-def services(
+def services(config, tl, ports):
-    config,
-    tl: bool,
-    ports: list[int],
-):
-    '''
-    List all `piker` "service deamons" to the console in
-    a `json`-table which maps each actor's UID in the form,
 
-    `{service_name}.{subservice_name}.{UUID}`
+    from ..service import (
-
-    to its (primary) IPC server address.
-
-    (^TODO, should be its multiaddr form once we support it)
-
-    Note that by convention actors which operate as "headless"
-    processes (those without GUIs/graphics, and which generally
-    parent some noteworthy subsystem) are normally suffixed by
-    a "d" such as,
-
-    - pikerd: the root runtime supervisor
-    - brokerd: a broker-backend order ctl daemon
-    - emsd: the internal dark-clearing and order routing daemon
-    - datad: a data-provider-backend data feed daemon
-    - samplerd: the real-time data sampling and clock-syncing daemon
-
-    "Headed units" are normally just given an obvious app-like name
-    with subactors indexed by `.` such as,
-    - chart: the primary modal charting iface, a Qt app
-    - chart.fsp_0: a financial-sig-proc cascade instance which
-                   delivers graphics to a parent `chart` app.
-    - polars_boi: some (presumably) `polars` using console app.
-
-    '''
-    from piker.service import (
         open_piker_runtime,
         _default_registry_port,
         _default_registry_host,
     )
 
-    # !TODO, mk this to work with UDS!
+    host = _default_registry_host
-    host: str = _default_registry_host
     if not ports:
-        ports: list[int] = [_default_registry_port]
+        ports = [_default_registry_port]
 
     addr = tractor._addr.wrap_address(
         addr=(host, ports[0])
@@ -354,11 +316,7 @@ def services(
         async with (
             open_piker_runtime(
                 name='service_query',
-                loglevel=(
+                loglevel=config['loglevel'] if tl else None,
-                    config['loglevel']
-                    if tl
-                    else None
-                ),
             ),
             tractor.get_registry(
                 addr=addr,
@@ -378,15 +336,7 @@ def services(
 
 
 def _load_clis() -> None:
-    '''
+    # from ..service import elastic  # noqa
-    Dynamically load and register all subsys CLI endpoints (at call
-    time).
-
-    NOTE, obviously this is normally expected to be called at
-    `import` time and implicitly relies on our use of various
-    `click`/`typer` decorator APIs.
-
-    '''
     from ..brokers import cli  # noqa
     from ..ui import cli  # noqa
     from ..watchlists import cli  # noqa
@@ -396,5 +346,5 @@ def _load_clis() -> None:
     from ..accounting import cli  # noqa
 
 
-# load all subsytem cli eps
+# load downstream cli modules
 _load_clis()

piker/data/_sampling.py

@@ -80,26 +80,25 @@ class Sampler:
     This non-instantiated type is meant to be a singleton within
     a `samplerd` actor-service spawned once by the user wishing to
     time-step-sample (real-time) quote feeds, see
-    `.service.maybe_open_samplerd()` and the below
+    ``.service.maybe_open_samplerd()`` and the below
-    `register_with_sampler()`.
+    ``register_with_sampler()``.
 
     '''
-    service_nursery: None|trio.Nursery = None
+    service_nursery: None | trio.Nursery = None
 
-    # TODO: we could stick these in a composed type to avoid angering
+    # TODO: we could stick these in a composed type to avoid
-    # the "i hate module scoped variables crowd" (yawn).
+    # angering the "i hate module scoped variables crowd" (yawn).
     ohlcv_shms: dict[float, list[ShmArray]] = {}
 
     # holds one-task-per-sample-period tasks which are spawned as-needed by
     # data feed requests with a given detected time step usually from
     # history loading.
-    incr_task_cs: trio.CancelScope|None = None
+    incr_task_cs: trio.CancelScope | None = None
 
     bcast_errors: tuple[Exception] = (
         trio.BrokenResourceError,
         trio.ClosedResourceError,
         trio.EndOfChannel,
-        tractor.TransportClosed,
     )
 
     # holds all the ``tractor.Context`` remote subscriptions for
@@ -249,8 +248,8 @@ class Sampler:
     async def broadcast(
         self,
         period_s: float,
-        time_stamp: float|None = None,
+        time_stamp: float | None = None,
-        info: dict|None = None,
+        info: dict | None = None,
 
     ) -> None:
         '''
@@ -292,10 +291,9 @@ class Sampler:
 
                     except self.bcast_errors as err:
                         log.error(
-                            f'Connection dropped for IPC ctx due to,\n'
+                            f'Connection dropped for IPC ctx\n'
-                            f'{type(err)!r}\n'
+                            f'{stream._ctx}\n\n'
-                            f'\n'
+                            f'Due to {type(err)}'
-                            f'{stream._ctx}'
                         )
                         borked.add(stream)
                 else:
@@ -315,7 +313,7 @@ class Sampler:
     @classmethod
     async def broadcast_all(
         self,
-        info: dict|None = None,
+        info: dict | None = None,
     ) -> None:
 
         # NOTE: take a copy of subs since removals can happen
@@ -332,22 +330,14 @@ class Sampler:
 async def register_with_sampler(
     ctx: Context,
     period_s: float,
-    shms_by_period: dict[float, dict]|None = None,
+    shms_by_period: dict[float, dict] | None = None,
 
     open_index_stream: bool = True,  # open a 2way stream for sample step msgs?
     sub_for_broadcasts: bool = True,  # sampler side to send step updates?
-    loglevel: str|None = None,
 
-) -> set[int]:
+) -> None:
 
-    get_console_log(
+    get_console_log(tractor.current_actor().loglevel)
-        level=(
-            loglevel
-            or
-            tractor.current_actor().loglevel
-        ),
-        name=__name__,
-    )
     incr_was_started: bool = False
 
     try:
@@ -372,12 +362,7 @@ async def register_with_sampler(
 
             # insert the base 1s period (for OHLC style sampling) into
             # the increment buffer set to update and shift every second.
-            if (
+            if shms_by_period is not None:
-                shms_by_period is not None
-                # and
-                # feed_is_live.is_set()
-                # ^TODO? pass it in instead?
-            ):
                 from ._sharedmem import (
                     attach_shm_array,
                     _Token,
@@ -391,17 +376,12 @@ async def register_with_sampler(
                         readonly=False,
                     )
                     shms_by_period[period] = shm
-                    Sampler.ohlcv_shms.setdefault(
+                    Sampler.ohlcv_shms.setdefault(period, []).append(shm)
-                        period,
-                        [],
-                    ).append(shm)
 
                 assert Sampler.ohlcv_shms
 
             # unblock caller
-            await ctx.started(
+            await ctx.started(set(Sampler.ohlcv_shms.keys()))
-                set(Sampler.ohlcv_shms.keys())
-            )
 
             if open_index_stream:
                 try:
@@ -447,7 +427,7 @@ async def register_with_sampler(
 
 async def spawn_samplerd(
 
-    loglevel: str|None = None,
+    loglevel: str | None = None,
     **extra_tractor_kwargs
 
 ) -> bool:
@@ -484,7 +464,6 @@ async def spawn_samplerd(
                 register_with_sampler,
                 period_s=1,
                 sub_for_broadcasts=False,
-                loglevel=loglevel,
             )
             return True
 
@@ -493,7 +472,8 @@ async def spawn_samplerd(
 
 @acm
 async def maybe_open_samplerd(
-    loglevel: str|None = None,
+
+    loglevel: str | None = None,
     **pikerd_kwargs,
 
 ) -> tractor.Portal:  # noqa
@@ -518,13 +498,13 @@ async def maybe_open_samplerd(
 @acm
 async def open_sample_stream(
     period_s: float,
-    shms_by_period: dict[float, dict]|None = None,
+    shms_by_period: dict[float, dict] | None = None,
     open_index_stream: bool = True,
     sub_for_broadcasts: bool = True,
-    loglevel: str|None = None,
 
-    # cache_key: str|None = None,
+    cache_key: str | None = None,
-    # allow_new_sampler: bool = True,
+    allow_new_sampler: bool = True,
+
     ensure_is_active: bool = False,
 
 ) -> AsyncIterator[dict[str, float]]:
@@ -553,15 +533,11 @@ async def open_sample_stream(
     #         yield bistream
     # else:
 
-    ctx: tractor.Context
-    shm_periods: set[int]  # in `int`-seconds
     async with (
         # XXX: this should be singleton on a host,
         # a lone broker-daemon per provider should be
         # created for all practical purposes
-        maybe_open_samplerd(
+        maybe_open_samplerd() as portal,
-            loglevel=loglevel,
-        ) as portal,
 
         portal.open_context(
             register_with_sampler,
@@ -570,12 +546,11 @@ async def open_sample_stream(
                 'shms_by_period': shms_by_period,
                 'open_index_stream': open_index_stream,
                 'sub_for_broadcasts': sub_for_broadcasts,
-                'loglevel': loglevel,
             },
-        ) as (ctx, shm_periods)
+        ) as (ctx, first)
     ):
         if ensure_is_active:
-            assert len(shm_periods) > 1
+            assert len(first) > 1
 
         async with (
             ctx.open_stream(
@@ -766,7 +741,7 @@ async def sample_and_broadcast(
                                 log.warning(
                                     f'Feed OVERRUN {sub_key}'
                                     f'@{bus.brokername} -> \n'
-                                    f'feed @ {chan.aid.reprol()}\n'
+                                    f'feed @ {chan.uid}\n'
                                     f'throttle = {throttle} Hz'
                                 )
 

piker/data/_sharedmem.py

@@ -520,12 +520,9 @@ def open_shm_array(
 
     # "unlink" created shm on process teardown by
     # pushing teardown calls onto actor context stack
-    stack = tractor.current_actor(
+    stack = tractor.current_actor().lifetime_stack
-        err_on_no_runtime=False,
+    stack.callback(shmarr.close)
-    ).lifetime_stack
+    stack.callback(shmarr.destroy)
-    if stack:
-        stack.callback(shmarr.close)
-        stack.callback(shmarr.destroy)
 
     return shmarr
 
@@ -610,10 +607,7 @@ def attach_shm_array(
         _known_tokens[key] = token
 
     # "close" attached shm on actor teardown
-    if (actor := tractor.current_actor(
+    tractor.current_actor().lifetime_stack.callback(sha.close)
-        err_on_no_runtime=False,
-    )):
-        actor.lifetime_stack.callback(sha.close)
 
     return sha
 

piker/data/_util.py

@@ -26,9 +26,7 @@ from ..log import (
 )
 subsys: str = 'piker.data'
 
-log = get_logger(
+log = get_logger(subsys)
-    name=subsys,
-)
 
 get_console_log = partial(
     get_console_log,

piker/data/_web_bs.py

@@ -31,7 +31,6 @@ from typing import (
     AsyncContextManager,
     AsyncGenerator,
     Iterable,
-    Type,
 )
 import json
 
@@ -68,7 +67,7 @@ class NoBsWs:
 
     '''
     # apparently we can QoS for all sorts of reasons..so catch em.
-    recon_errors: tuple[Type[Exception]] = (
+    recon_errors = (
         ConnectionClosed,
         DisconnectionTimeout,
         ConnectionRejected,
@@ -106,10 +105,7 @@ class NoBsWs:
     def connected(self) -> bool:
         return self._connected.is_set()
 
-    async def reset(
+    async def reset(self) -> None:
-        self,
-        timeout: float,
-    ) -> bool:
         '''
         Reset the underlying ws connection by cancelling
         the bg relay task and waiting for it to signal
@@ -118,31 +114,18 @@ class NoBsWs:
         '''
         self._connected = trio.Event()
         self._cs.cancel()
-        with trio.move_on_after(timeout) as cs:
+        await self._connected.wait()
-            await self._connected.wait()
-            return True
-
-        assert cs.cancelled_caught
-        return False
 
     async def send_msg(
         self,
         data: Any,
-        timeout: float = 3,
     ) -> None:
         while True:
             try:
                 msg: Any = self._dumps(data)
                 return await self._ws.send_message(msg)
             except self.recon_errors:
-                with trio.CancelScope(shield=True):
+                await self.reset()
-                    reconnected: bool = await self.reset(
-                        timeout=timeout,
-                    )
-                    if not reconnected:
-                        log.warning(
-                            'Failed to reconnect after {timeout!r}s ??'
-                        )
 
     async def recv_msg(self) -> Any:
         msg: Any = await self._rx.receive()
@@ -208,9 +191,7 @@ async def _reconnect_forever(
                         f'{src_mod}\n'
                         f'{url} connection bail with:'
                     )
-                    with trio.CancelScope(shield=True):
+                    await trio.sleep(0.5)
-                        await trio.sleep(0.5)
-
                     rent_cs.cancel()
 
                     # go back to reonnect loop in parent task
@@ -310,8 +291,7 @@ async def _reconnect_forever(
             log.exception(
                 'Reconnect-attempt failed ??\n'
             )
-            with trio.CancelScope(shield=True):
+            await trio.sleep(0.2)  # throttle
-                await trio.sleep(0.2)  # throttle
             raise berr
 
         #|_ws & nursery block ends
@@ -371,39 +351,32 @@ async def open_autorecon_ws(
     rcv: trio.MemoryReceiveChannel
     snd, rcv = trio.open_memory_channel(616)
 
-    try:
+    async with (
-        async with (
+        tractor.trionics.collapse_eg(),
-            tractor.trionics.collapse_eg(),
+        trio.open_nursery() as tn
-            trio.open_nursery() as tn
+    ):
-        ):
+        nobsws = NoBsWs(
-            nobsws = NoBsWs(
+            url,
-                url,
+            rcv,
-                rcv,
+            msg_recv_timeout=msg_recv_timeout,
-                msg_recv_timeout=msg_recv_timeout,
-            )
-            await tn.start(
-                partial(
-                    _reconnect_forever,
-                    url,
-                    snd,
-                    nobsws,
-                    fixture=fixture,
-                    reset_after=reset_after,
-                )
-            )
-            await nobsws._connected.wait()
-            assert nobsws._cs
-            assert nobsws.connected()
-            try:
-                yield nobsws
-            finally:
-                tn.cancel_scope.cancel()
-
-    except NoBsWs.recon_errors as con_err:
-        log.warning(
-            f'Entire ws-channel disconnect due to,\n'
-            f'con_err: {con_err!r}\n'
         )
+        await tn.start(
+            partial(
+                _reconnect_forever,
+                url,
+                snd,
+                nobsws,
+                fixture=fixture,
+                reset_after=reset_after,
+            )
+        )
+        await nobsws._connected.wait()
+        assert nobsws._cs
+        assert nobsws.connected()
+        try:
+            yield nobsws
+        finally:
+            tn.cancel_scope.cancel()
 
 
 '''

piker/data/feed.py

@@ -62,6 +62,7 @@ from ._util import (
     log,
     get_console_log,
 )
+from .flows import Flume
 from .validate import (
     FeedInit,
     validate_backend,
@@ -76,7 +77,6 @@ from ._sampling import (
 )
 
 if TYPE_CHECKING:
-    from .flows import Flume
     from tractor._addr import Address
     from tractor.msg.types import Aid
 
@@ -239,6 +239,7 @@ async def allocate_persistent_feed(
 
     brokername: str,
     symstr: str,
+
     loglevel: str,
     start_stream: bool = True,
     init_timeout: float = 616,
@@ -277,7 +278,7 @@ async def allocate_persistent_feed(
     # ``stream_quotes()``, a required broker backend endpoint.
     init_msgs: (
         list[FeedInit]  # new
-        |dict[str, dict[str, str]]  # legacy / deprecated
+        | dict[str, dict[str, str]]  # legacy / deprecated
     )
 
     # TODO: probably make a struct msg type for this as well
@@ -347,14 +348,11 @@ async def allocate_persistent_feed(
         izero_rt,
         rt_shm,
     ) = await bus.nursery.start(
-        partial(
+        manage_history,
-            manage_history,
+        mod,
-            mod=mod,
+        mkt,
-            mkt=mkt,
+        some_data_ready,
-            some_data_ready=some_data_ready,
+        feed_is_live,
-            feed_is_live=feed_is_live,
-            loglevel=loglevel,
-        )
     )
 
     # yield back control to starting nursery once we receive either
@@ -364,8 +362,6 @@ async def allocate_persistent_feed(
     )
     await some_data_ready.wait()
 
-    # XXX, avoid cycle; it imports this mod.
-    from .flows import Flume
     flume = Flume(
 
         # TODO: we have to use this for now since currently the
@@ -462,6 +458,7 @@ async def allocate_persistent_feed(
 
 @tractor.context
 async def open_feed_bus(
+
     ctx: tractor.Context,
     brokername: str,
     symbols: list[str],  # normally expected to the broker-specific fqme
@@ -482,16 +479,13 @@ async def open_feed_bus(
 
     '''
     if loglevel is None:
-        loglevel: str = tractor.current_actor().loglevel
+        loglevel = tractor.current_actor().loglevel
 
     # XXX: required to propagate ``tractor`` loglevel to piker
     # logging
     get_console_log(
-        level=(loglevel
+        loglevel
-            or
+        or tractor.current_actor().loglevel
-            tractor.current_actor().loglevel
-        ),
-        name=__name__,
     )
 
     # local state sanity checks
@@ -506,6 +500,7 @@ async def open_feed_bus(
     sub_registered = trio.Event()
 
     flumes: dict[str, Flume] = {}
+
     for symbol in symbols:
 
         # if no cached feed for this symbol has been created for this
@@ -689,7 +684,6 @@ class Feed(Struct):
     '''
     mods: dict[str, ModuleType] = {}
     portals: dict[ModuleType, tractor.Portal] = {}
-
     flumes: dict[
         str,  # FQME
         Flume,
@@ -803,7 +797,7 @@ async def install_brokerd_search(
 @acm
 async def maybe_open_feed(
     fqmes: list[str],
-    loglevel: str|None = None,
+    loglevel: str | None = None,
 
     **kwargs,
 
@@ -887,6 +881,7 @@ async def open_feed(
 
     # one actor per brokerd for now
     brokerd_ctxs = []
+
     for brokermod, bfqmes in providers.items():
 
         # if no `brokerd` for this backend exists yet we spawn
@@ -956,8 +951,6 @@ async def open_feed(
 
         assert len(feed.mods) == len(feed.portals)
 
-        # XXX, avoid cycle; it imports this mod.
-        from .flows import Flume
         async with (
             trionics.gather_contexts(bus_ctxs) as ctxs,
         ):

piker/fsp/_engine.py

@@ -24,7 +24,6 @@ from functools import partial
 from typing import (
     AsyncIterator,
     Callable,
-    TYPE_CHECKING,
 )
 
 import numpy as np
@@ -34,12 +33,12 @@ import tractor
 from tractor.msg import NamespacePath
 
 from piker.types import Struct
-from ..log import (
+from ..log import get_logger, get_console_log
-    get_logger,
-    get_console_log,
-)
 from .. import data
-from ..data.flows import Flume
+from ..data.feed import (
+    Flume,
+    Feed,
+)
 from ..data._sharedmem import ShmArray
 from ..data._sampling import (
     _default_delay_s,
@@ -53,9 +52,6 @@ from ._api import (
 )
 from ..toolz import Profiler
 
-if TYPE_CHECKING:
-    from ..data.feed import Feed
-
 log = get_logger(__name__)
 
 
@@ -173,10 +169,8 @@ class Cascade(Struct):
         if not synced:
             fsp: Fsp = self.fsp
             log.warning(
-                f'***DESYNCED fsp***\n'
+                '***DESYNCED FSP***\n'
-                f'------------------\n'
+                f'{fsp.ns_path}@{src_shm.token}\n'
-                f'ns-path: {fsp.ns_path!r}\n'
-                f'shm-token: {src_shm.token}\n'
                 f'step_diff: {step_diff}\n'
                 f'len_diff: {len_diff}\n'
             )
@@ -404,6 +398,7 @@ async def connect_streams(
 
 @tractor.context
 async def cascade(
+
     ctx: tractor.Context,
 
     # data feed key
@@ -417,7 +412,7 @@ async def cascade(
     shm_registry: dict[str, _Token],
 
     zero_on_step: bool = False,
-    loglevel: str|None = None,
+    loglevel: str | None = None,
 
 ) -> None:
     '''
@@ -431,17 +426,7 @@ async def cascade(
     )
 
     if loglevel:
-        log = get_console_log(
+        get_console_log(loglevel)
-            loglevel,
-            name=__name__,
-        )
-        # XXX TODO!
-        # figure out why this writes a dict to,
-        # `tractor._state._runtime_vars['_root_mailbox']`
-        # XD .. wtf
-        # TODO, solve this as reported in,
-        # https://www.pikers.dev/pikers/piker/issues/70
-        # await tractor.pause()
 
     src: Flume = Flume.from_msg(src_flume_addr)
     dst: Flume = Flume.from_msg(
@@ -484,8 +469,7 @@ async def cascade(
     # open a data feed stream with requested broker
     feed: Feed
     async with data.feed.maybe_open_feed(
-        fqmes=[fqme],
+        [fqme],
-        loglevel=loglevel,
 
         # TODO throttle tick outputs from *this* daemon since
         # it'll emit tons of ticks due to the throttle only
@@ -583,8 +567,7 @@ async def cascade(
                     # on every step msg received from the global `samplerd`
                     # service.
                     async with open_sample_stream(
-                        period_s=float(delay_s),
+                        float(delay_s)
-                        loglevel=loglevel,
                     ) as istream:
 
                         profiler(f'{func_name}: sample stream up')

piker/log.py

@@ -37,84 +37,35 @@ _proj_name: str = 'piker'
 
 
 def get_logger(
-    name: str|None = None,
+    name: str = None,
-    **tractor_log_kwargs,
+
 ) -> logging.Logger:
     '''
-    Return the package log or a sub-logger if a `name=` is provided,
+    Return the package log or a sub-log for `name` if provided.
-    which defaults to the calling module's pkg-namespace path.
-
-    See `tractor.log.get_logger()` for details.
 
     '''
-    pkg_name: str = _proj_name
-    if (
-        name
-        and
-        pkg_name in name
-    ):
-        name: str = name.lstrip(f'{_proj_name}.')
-
     return tractor.log.get_logger(
         name=name,
-        pkg_name=pkg_name,
+        _root_name=_proj_name,
-        **tractor_log_kwargs,
     )
 
 
 def get_console_log(
-    level: str|None = None,
+    level: str | None = None,
-    name: str|None = None,
+    name: str | None = None,
-    pkg_name: str|None = None,
-    with_tractor_log: bool = False,
-    # ?TODO, support a "log-spec" style `str|dict[str, str]` which
-    # dictates both the sublogger-key and a level?
-    # -> see similar idea in `modden`'s usage.
-    **tractor_log_kwargs,
 
 ) -> logging.Logger:
     '''
-    Get the package logger and enable a handler which writes to
+    Get the package logger and enable a handler which writes to stderr.
-    stderr.
 
-    Yeah yeah, i know we can use `DictConfig`.
+    Yeah yeah, i know we can use ``DictConfig``. You do it...
-    You do it.. Bp
 
     '''
-    pkg_name: str = _proj_name
-    if (
-        name
-        and
-        pkg_name in name
-    ):
-        name: str = name.lstrip(f'{_proj_name}.')
-
-    tll: str|None = None
-    if (
-        with_tractor_log is not False
-    ):
-        tll = level
-
-    elif maybe_actor := tractor.current_actor(
-        err_on_no_runtime=False,
-    ):
-        tll = maybe_actor.loglevel
-
-    if tll:
-        t_log = tractor.log.get_console_log(
-            level=tll,
-            name='tractor',  # <- XXX, force root tractor log!
-            **tractor_log_kwargs,
-        )
-        # TODO/ allow only enabling certain tractor sub-logs?
-        assert t_log.name == 'tractor'
-
     return tractor.log.get_console_log(
-        level=level,
+        level,
         name=name,
-        pkg_name=pkg_name,
+        _root_name=_proj_name,
-        **tractor_log_kwargs,
+    )  # our root logger
-    )
 
 
 def colorize_json(

piker/service/_actor_runtime.py

@@ -21,6 +21,7 @@
 from __future__ import annotations
 import os
 from typing import (
+    Optional,
     Any,
     ClassVar,
 )
@@ -31,11 +32,8 @@ from contextlib import (
 import tractor
 import trio
 
-from piker.log import (
-    get_console_log,
-)
 from ._util import (
-    subsys,
+    get_console_log,
 )
 from ._mngr import (
     Services,
@@ -61,7 +59,7 @@ async def open_piker_runtime(
     registry_addrs: list[tuple[str, int]] = [],
 
     enable_modules: list[str] = [],
-    loglevel: str|None = None,
+    loglevel: Optional[str] = None,
 
     # XXX NOTE XXX: you should pretty much never want debug mode
     # for data daemons when running in production.
@@ -71,7 +69,7 @@ async def open_piker_runtime(
     # and spawn the service tree distributed per that.
     start_method: str = 'trio',
 
-    tractor_runtime_overrides: dict|None = None,
+    tractor_runtime_overrides: dict | None = None,
     **tractor_kwargs,
 
 ) -> tuple[
@@ -99,8 +97,7 @@ async def open_piker_runtime(
         # setting it as the root actor on localhost.
         registry_addrs = (
             registry_addrs
-            or
+            or [_default_reg_addr]
-            [_default_reg_addr]
         )
 
         if ems := tractor_kwargs.pop('enable_modules', None):
@@ -166,7 +163,8 @@ _root_modules: list[str] = [
 @acm
 async def open_pikerd(
     registry_addrs: list[tuple[str, int]],
-    loglevel: str|None = None,
+
+    loglevel: str | None = None,
 
     # XXX: you should pretty much never want debug mode
     # for data daemons when running in production.
@@ -194,6 +192,7 @@ async def open_pikerd(
 
     async with (
         open_piker_runtime(
+
             name=_root_dname,
             loglevel=loglevel,
             debug_mode=debug_mode,
@@ -274,10 +273,7 @@ async def maybe_open_pikerd(
 
     '''
     if loglevel:
-        get_console_log(
+        get_console_log(loglevel)
-            name=subsys,
-            level=loglevel
-        )
 
     # subtle, we must have the runtime up here or portal lookup will fail
     query_name = kwargs.pop(

piker/service/_ahab.py

@@ -49,15 +49,13 @@ from requests.exceptions import (
     ReadTimeout,
 )
 
-from piker.log import (
-    get_console_log,
-    get_logger,
-)
 from ._mngr import Services
+from ._util import (
+    log,  # sub-sys logger
+    get_console_log,
+)
 from .. import config
 
-log = get_logger(name=__name__)
-
 
 class DockerNotStarted(Exception):
     'Prolly you dint start da daemon bruh'
@@ -338,16 +336,13 @@ class Container:
 async def open_ahabd(
     ctx: tractor.Context,
     endpoint: str,  # ns-pointer str-msg-type
-    loglevel: str = 'cancel',
+    loglevel: str | None = None,
 
     **ep_kwargs,
 
 ) -> None:
 
-    log = get_console_log(
+    log = get_console_log(loglevel or 'cancel')
-        level=loglevel,
-        name='piker.service',
-    )
 
     async with open_docker() as client:
 

piker/service/_daemon.py

@@ -30,9 +30,8 @@ from contextlib import (
 import tractor
 from trio.lowlevel import current_task
 
-from piker.log import (
+from ._util import (
-    get_console_log,
+    log,  # sub-sys logger
-    get_logger,
 )
 from ._mngr import (
     Services,
@@ -40,17 +39,16 @@ from ._mngr import (
 from ._actor_runtime import maybe_open_pikerd
 from ._registry import find_service
 
-log = get_logger(name=__name__)
-
 
 @acm
 async def maybe_spawn_daemon(
+
     service_name: str,
     service_task_target: Callable,
 
     spawn_args: dict[str, Any],
 
-    loglevel: str|None = None,
+    loglevel: str | None = None,
     singleton: bool = False,
 
     **pikerd_kwargs,
@@ -68,12 +66,6 @@ async def maybe_spawn_daemon(
     clients.
 
     '''
-    log = get_console_log(
-        level=loglevel,
-        name=__name__,
-    )
-    assert log.name == 'piker.service'
-
     # serialize access to this section to avoid
     # 2 or more tasks racing to create a daemon
     lock = Services.locks[service_name]
@@ -160,7 +152,8 @@ async def maybe_spawn_daemon(
 
 
 async def spawn_emsd(
-    loglevel: str|None = None,
+
+    loglevel: str | None = None,
     **extra_tractor_kwargs
 
 ) -> bool:
@@ -197,8 +190,9 @@ async def spawn_emsd(
 
 @acm
 async def maybe_open_emsd(
+
     brokername: str,
-    loglevel: str|None = None,
+    loglevel: str | None = None,
 
     **pikerd_kwargs,
 

piker/service/_mngr.py

@@ -34,9 +34,9 @@ from tractor import (
     Portal,
 )
 
-from piker.log import get_logger
+from ._util import (
-
+    log,  # sub-sys logger
-log = get_logger(name=__name__)
+)
 
 
 # TODO: we need remote wrapping and a general soln:

piker/service/_registry.py

@@ -27,29 +27,15 @@ from typing import (
 )
 
 import tractor
-from tractor import (
+from tractor import Portal
-    msg,
+
-    Actor,
+from ._util import (
-    Portal,
+    log,  # sub-sys logger
 )
 
-from piker.log import get_logger
-
-log = get_logger(name=__name__)
-
-# TODO? default path-space for UDS registry?
-# [ ] needs to be Xplatform tho!
-# _default_registry_path: Path = (
-#     Path(os.environ['XDG_RUNTIME_DIR'])
-#     /'piker'
-# )
-
 _default_registry_host: str = '127.0.0.1'
 _default_registry_port: int = 6116
-_default_reg_addr: tuple[
+_default_reg_addr: tuple[str, int] = (
-    str,
-    int, # |str TODO, once we support UDS, see above.
-] = (
     _default_registry_host,
     _default_registry_port,
 )
@@ -89,22 +75,16 @@ async def open_registry(
 
     '''
     global _tractor_kwargs
-    actor: Actor = tractor.current_actor()
+    actor = tractor.current_actor()
-    aid: msg.Aid = actor.aid
+    uid = actor.uid
-    uid: tuple[str, str] = aid.uid
+    preset_reg_addrs: list[tuple[str, int]] = Registry.addrs
-    preset_reg_addrs: list[
-        tuple[str, int]
-    ] = Registry.addrs
     if (
         preset_reg_addrs
-        and
+        and addrs
-        addrs
     ):
         if preset_reg_addrs != addrs:
             # if any(addr in preset_reg_addrs for addr in addrs):
-            diff: set[
+            diff: set[tuple[str, int]] = set(preset_reg_addrs) - set(addrs)
-                tuple[str, int]
-            ] = set(preset_reg_addrs) - set(addrs)
             if diff:
                 log.warning(
                     f'`{uid}` requested only subset of registrars: {addrs}\n'
@@ -118,6 +98,7 @@ async def open_registry(
                 )
 
     was_set: bool = False
+
     if (
         not tractor.is_root_process()
         and
@@ -134,23 +115,16 @@ async def open_registry(
             f"`{uid}` registry should already exist but doesn't?"
         )
 
-    if not Registry.addrs:
+    if (
+        not Registry.addrs
+    ):
         was_set = True
-        Registry.addrs = (
+        Registry.addrs = addrs or [_default_reg_addr]
-            addrs
-            or
-            [_default_reg_addr]
-        )
 
     # NOTE: only spot this seems currently used is inside
     # `.ui._exec` which is the (eventual qtloops) bootstrapping
     # with guest mode.
-    reg_addrs: list[tuple[str, str|int]] = Registry.addrs
+    _tractor_kwargs['registry_addrs'] = Registry.addrs
-    # !TODO, a struct-API to stringently allow this only in special
-    # cases?
-    # -> better would be to have some way to (atomically) rewrite
-    #    and entire `RuntimeVars`?? ideas welcome obvi..
-    _tractor_kwargs['registry_addrs'] = reg_addrs
 
     try:
         yield Registry.addrs
@@ -175,7 +149,7 @@ async def find_service(
     | None
 ):
     # try:
-    reg_addrs: list[tuple[str, int|str]]
+    reg_addrs: list[tuple[str, int]]
     async with open_registry(
         addrs=(
             registry_addrs
@@ -198,13 +172,15 @@ async def find_service(
             only_first=first_only,  # if set only returns single ref
         ) as maybe_portals:
             if not maybe_portals:
-                log.info(
+                # log.info(
+                print(
                     f'Could NOT find service {service_name!r} -> {maybe_portals!r}'
                 )
                 yield None
                 return
 
-            log.info(
+            # log.info(
+            print(
                 f'Found service {service_name!r} -> {maybe_portals}'
             )
             yield maybe_portals
@@ -219,7 +195,8 @@ async def find_service(
 
 async def check_for_service(
     service_name: str,
-) -> None|tuple[str, int]:
+
+) -> None | tuple[str, int]:
     '''
     Service daemon "liveness" predicate.
 

piker/service/_util.py

@@ -14,12 +14,20 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
-Sub-sys module commons (if any ?? Bp).
+Sub-sys module commons.
 
 """
+from functools import partial
+
+from ..log import (
+    get_logger,
+    get_console_log,
+)
 subsys: str = 'piker.service'
 
-# ?TODO, if we were going to keep a `get_console_log()` in here to be
+log = get_logger(subsys)
-# invoked at `import`-time, how do we dynamically hand in the
+
-# `level=` value? seems too early in the runtime to be injected
+get_console_log = partial(
-# right?
+    get_console_log,
+    name=subsys,
+)

piker/service/elastic.py

@@ -16,7 +16,6 @@
 
 from __future__ import annotations
 from contextlib import asynccontextmanager as acm
-from pprint import pformat
 from typing import (
     Any,
     TYPE_CHECKING,
@@ -27,17 +26,12 @@ import asks
 if TYPE_CHECKING:
     import docker
     from ._ahab import DockerContainer
-    from . import (
-        Services,
-    )
 
-from piker.log import (
+from ._util import log  # sub-sys logger
+from ._util import (
     get_console_log,
-    get_logger,
 )
 
-log = get_logger(name=__name__)
-
 
 # container level config
 _config = {
@@ -73,10 +67,7 @@ def start_elasticsearch(
             elastic
 
     '''
-    get_console_log(
+    get_console_log('info', name=__name__)
-        level='info',
-        name=__name__,
-    )
 
     dcntr: DockerContainer = client.containers.run(
         'piker:elastic',

piker/service/marketstore.py

@@ -52,18 +52,17 @@ import pendulum
 # TODO: import this for specific error set expected by mkts client
 # import purerpc
 
-from piker.data.feed import maybe_open_feed
+from ..data.feed import maybe_open_feed
 from . import Services
-from piker.log import (
+from ._util import (
+    log,  # sub-sys logger
     get_console_log,
-    get_logger,
 )
 
 if TYPE_CHECKING:
     import docker
     from ._ahab import DockerContainer
 
-log = get_logger(name=__name__)
 
 
 # ahabd-supervisor and container level config

piker/storage/__init__.py

@@ -43,6 +43,7 @@ from typing import (
 
 import numpy as np
 
+
 from .. import config
 from ..service import (
     check_for_service,
@@ -151,10 +152,7 @@ class StorageConnectionError(ConnectionError):
 
     '''
 
-def get_storagemod(
+def get_storagemod(name: str) -> ModuleType:
-    name: str,
-
-) -> ModuleType:
     mod: ModuleType = import_module(
         '.' + name,
         'piker.storage',
@@ -167,12 +165,9 @@ def get_storagemod(
 
 @acm
 async def open_storage_client(
-    backend: str|None = None,
+    backend: str | None = None,
 
-) -> tuple[
+) -> tuple[ModuleType, StorageClient]:
-    ModuleType,
-    StorageClient,
-]:
     '''
     Load the ``StorageClient`` for named backend.
 
@@ -272,10 +267,7 @@ async def open_tsdb_client(
     from ..data.feed import maybe_open_feed
 
     async with (
-        open_storage_client() as (
+        open_storage_client() as (_, storage),
-            _,
-            storage,
-        ),
 
         maybe_open_feed(
             [fqme],
@@ -283,7 +275,7 @@ async def open_tsdb_client(
 
         ) as feed,
     ):
-        profiler(f'opened feed for {fqme!r}')
+        profiler(f'opened feed for {fqme}')
 
         # to_append = feed.hist_shm.array
         # to_prepend = None

piker/storage/cli.py

@@ -19,10 +19,16 @@ Storage middle-ware CLIs.
 
 """
 from __future__ import annotations
+# from datetime import datetime
+# from contextlib import (
+#     AsyncExitStack,
+# )
 from pathlib import Path
+from math import copysign
 import time
 from types import ModuleType
 from typing import (
+    Any,
     TYPE_CHECKING,
 )
 
@@ -41,6 +47,7 @@ from piker.data import (
     ShmArray,
 )
 from piker import tsp
+from piker.data._formatters import BGM
 from . import log
 from . import (
     __tsdbs__,
@@ -235,12 +242,122 @@ def anal(
     trio.run(main)
 
 
+async def markup_gaps(
+    fqme: str,
+    timeframe: float,
+    actl: AnnotCtl,
+    wdts: pl.DataFrame,
+    gaps: pl.DataFrame,
+
+) -> dict[int, dict]:
+    '''
+    Remote annotate time-gaps in a dt-fielded ts (normally OHLC)
+    with rectangles.
+
+    '''
+    aids: dict[int] = {}
+    for i in range(gaps.height):
+
+        row: pl.DataFrame = gaps[i]
+
+        # the gap's RIGHT-most bar's OPEN value
+        # at that time (sample) step.
+        iend: int = row['index'][0]
+        # dt: datetime = row['dt'][0]
+        # dt_prev: datetime = row['dt_prev'][0]
+        # dt_end_t: float = dt.timestamp()
+
+
+        # TODO: can we eventually remove this
+        # once we figure out why the epoch cols
+        # don't match?
+        # TODO: FIX HOW/WHY these aren't matching
+        # and are instead off by 4hours (EST
+        # vs. UTC?!?!)
+        # end_t: float = row['time']
+        # assert (
+        #     dt.timestamp()
+        #     ==
+        #     end_t
+        # )
+
+        # the gap's LEFT-most bar's CLOSE value
+        # at that time (sample) step.
+        prev_r: pl.DataFrame = wdts.filter(
+            pl.col('index') == iend - 1
+        )
+        # XXX: probably a gap in the (newly sorted or de-duplicated)
+        # dt-df, so we might need to re-index first..
+        if prev_r.is_empty():
+            await tractor.pause()
+
+        istart: int = prev_r['index'][0]
+        # dt_start_t: float = dt_prev.timestamp()
+
+        # start_t: float = prev_r['time']
+        # assert (
+        #     dt_start_t
+        #     ==
+        #     start_t
+        # )
+
+        # TODO: implement px-col width measure
+        # and ensure at least as many px-cols
+        # shown per rect as configured by user.
+        # gap_w: float = abs((iend - istart))
+        # if gap_w < 6:
+        #     margin: float = 6
+        #     iend += margin
+        #     istart -= margin
+
+        rect_gap: float = BGM*3/8
+        opn: float = row['open'][0]
+        ro: tuple[float, float] = (
+            # dt_end_t,
+            iend + rect_gap + 1,
+            opn,
+        )
+        cls: float = prev_r['close'][0]
+        lc: tuple[float, float] = (
+            # dt_start_t,
+            istart - rect_gap, # + 1 ,
+            cls,
+        )
+
+        color: str = 'dad_blue'
+        diff: float = cls - opn
+        sgn: float = copysign(1, diff)
+        color: str = {
+            -1: 'buy_green',
+            1: 'sell_red',
+        }[sgn]
+
+        rect_kwargs: dict[str, Any] = dict(
+            fqme=fqme,
+            timeframe=timeframe,
+            start_pos=lc,
+            end_pos=ro,
+            color=color,
+        )
+
+        aid: int = await actl.add_rect(**rect_kwargs)
+        assert aid
+        aids[aid] = rect_kwargs
+
+    # tell chart to redraw all its
+    # graphics view layers Bo
+    await actl.redraw(
+        fqme=fqme,
+        timeframe=timeframe,
+    )
+    return aids
+
+
 @store.command()
 def ldshm(
     fqme: str,
     write_parquet: bool = True,
     reload_parquet_to_shm: bool = True,
-    pdb: bool = False,  # --pdb passed?
 
 ) -> None:
     '''
@@ -260,7 +377,7 @@ def ldshm(
             open_piker_runtime(
                 'polars_boi',
                 enable_modules=['piker.data._sharedmem'],
-                debug_mode=pdb,
+                debug_mode=True,
             ),
             open_storage_client() as (
                 mod,
@@ -280,19 +397,17 @@ def ldshm(
 
                 times: np.ndarray = shm.array['time']
                 d1: float = float(times[-1] - times[-2])
-                d2: float = 0
+                d2: float = float(times[-2] - times[-3])
-                # XXX, take a median sample rate if sufficient data
+                med: float = np.median(np.diff(times))
-                if times.size > 2:
+                if (
-                    d2: float = float(times[-2] - times[-3])
+                    d1 < 1.
-                    med: float = np.median(np.diff(times))
+                    and d2 < 1.
-                    if (
+                    and med < 1.
-                        d1 < 1.
+                ):
-                        and d2 < 1.
+                    raise ValueError(
-                        and med < 1.
+                        f'Something is wrong with time period for {shm}:\n{times}'
-                    ):
+                    )
-                        raise ValueError(
+
-                            f'Something is wrong with time period for {shm}:\n{times}'
-                        )
                 period_s: float = float(max(d1, d2, med))
 
                 null_segs: tuple = tsp.get_null_segs(
@@ -302,9 +417,7 @@ def ldshm(
 
                 # TODO: call null-seg fixer somehow?
                 if null_segs:
-
+                    await tractor.pause()
-                    if tractor._state.is_debug_mode():
-                        await tractor.pause()
                 #     async with (
                 #         trio.open_nursery() as tn,
                 #         mod.open_history_client(
@@ -328,37 +441,11 @@ def ldshm(
                     wdts,
                     deduped,
                     diff,
-                    valid_races,
+                ) = tsp.dedupe(
-                    dq_issues,
-                ) = tsp.dedupe_ohlcv_smart(
                     shm_df,
+                    period=period_s,
                 )
 
-                # Report duplicate analysis
-                if diff > 0:
-                    log.info(
-                        f'Removed {diff} duplicate timestamp(s)\n'
-                    )
-                    if valid_races is not None:
-                        identical: int = (
-                            valid_races
-                            .filter(pl.col('identical_bars'))
-                            .height
-                        )
-                        monotonic: int = valid_races.height - identical
-                        log.info(
-                            f'Valid race conditions: {valid_races.height}\n'
-                            f'  - Identical bars: {identical}\n'
-                            f'  - Volume monotonic: {monotonic}\n'
-                        )
-
-                    if dq_issues is not None:
-                        log.warning(
-                            f'DATA QUALITY ISSUES from provider: '
-                            f'{dq_issues.height} timestamp(s)\n'
-                            f'{dq_issues}\n'
-                        )
-
                 # detect gaps from in expected (uniform OHLC) sample period
                 step_gaps: pl.DataFrame = tsp.detect_time_gaps(
                     deduped,
@@ -373,8 +460,7 @@ def ldshm(
 
                     # TODO: actually pull the exact duration
                     # expected for each venue operational period?
-                    # gap_dt_unit='day',
+                    gap_dt_unit='days',
-                    gap_dt_unit='day',
                     gap_thresh=1,
                 )
 
@@ -385,11 +471,8 @@ def ldshm(
                 if (
                     not venue_gaps.is_empty()
                     or (
-                        not step_gaps.is_empty()
+                        period_s < 60
-                        # XXX, i presume i put this bc i was guarding
+                        and not step_gaps.is_empty()
-                        # for ib venue gaps?
-                        # and
-                        # period_s < 60
                     )
                 ):
                     # write repaired ts to parquet-file?
@@ -438,7 +521,7 @@ def ldshm(
                     do_markup_gaps: bool = True
                     if do_markup_gaps:
                         new_df: pl.DataFrame = tsp.np2pl(new)
-                        aids: dict = await tsp._annotate.markup_gaps(
+                        aids: dict = await markup_gaps(
                             fqme,
                             period_s,
                             actl,
@@ -447,23 +530,12 @@ def ldshm(
                         )
                         # last chance manual overwrites in REPL
                         # await tractor.pause()
-                        if not aids:
+                        assert aids
-                            log.warning(
-                                f'No gaps were found !?\n'
-                                f'fqme: {fqme!r}\n'
-                                f'timeframe: {period_s!r}\n'
-                                f"WELL THAT'S GOOD NOOZ!\n"
-                            )
                         tf2aids[period_s] = aids
 
                 else:
-                    # No significant gaps to handle, but may have had
+                    # allow interaction even when no ts problems.
-                    # duplicates removed (valid race conditions are ok)
+                    assert not diff
-                    if diff > 0 and dq_issues is not None:
-                        log.warning(
-                            'Found duplicates with data quality issues '
-                            'but no significant time gaps!\n'
-                        )
 
             await tractor.pause()
             log.info('Exiting TSP shm anal-izer!')

piker/tsp/_anal.py

@@ -54,10 +54,10 @@ from ..log import (
 # for "time series processing"
 subsys: str = 'piker.tsp'
 
-log = get_logger(name=__name__)
+log = get_logger(subsys)
 get_console_log = partial(
     get_console_log,
-    name=subsys,  # activate for subsys-pkg "downward"
+    name=subsys,
 )
 
 # NOTE: union type-defs to handle generic `numpy` and `polars` types
@@ -275,18 +275,6 @@ def get_null_segs(
         # diff of abs index steps between each zeroed row
         absi_zdiff: np.ndarray = np.diff(absi_zeros)
 
-        if zero_t.size < 2:
-            try:
-                breakpoint()
-            except RuntimeError:
-                # XXX, if greenback not active from
-                # piker store ldshm cmd..
-                log.exception(
-                    "Can't debug single-sample null!\n"
-                )
-
-            return None
-
         # scan for all frame-indices where the
         # zeroed-row-abs-index-step-diff is greater then the
         # expected increment of 1.
@@ -446,8 +434,8 @@ def get_null_segs(
 
 def iter_null_segs(
     timeframe: float,
-    frame: Frame|None = None,
+    frame: Frame | None = None,
-    null_segs: tuple|None = None,
+    null_segs: tuple | None = None,
 
 ) -> Generator[
     tuple[
@@ -499,8 +487,7 @@ def iter_null_segs(
         start_dt = None
         if (
             absi_start is not None
-            and
+            and start_t != 0
-            start_t != 0
         ):
             fi_start: int = absi_start - absi_first
             start_row: Seq = frame[fi_start]
@@ -514,8 +501,8 @@ def iter_null_segs(
         yield (
             absi_start, absi_end,  # abs indices
             fi_start, fi_end,  # relative "frame" indices
-            start_t, end_t,  # epoch times
+            start_t, end_t,
-            start_dt, end_dt,  # dts
+            start_dt, end_dt,
         )
 
 
@@ -591,22 +578,11 @@ def detect_time_gaps(
     # NOTE: this flag is to indicate that on this (sampling) time
     # scale we expect to only be filtering against larger venue
     # closures-scale time gaps.
-    #
-    # Map to total_ method since `dt_diff` is a duration type,
-    # not datetime - modern polars requires `total_*` methods
-    # for duration types (e.g. `total_days()` not `day()`)
-    # Ensure plural form for polars API (e.g. 'day' -> 'days')
-    unit_plural: str = (
-        gap_dt_unit
-        if gap_dt_unit.endswith('s')
-        else f'{gap_dt_unit}s'
-    )
-    duration_method: str = f'total_{unit_plural}'
     return step_gaps.filter(
         # Second by an arbitrary dt-unit step size
         getattr(
             pl.col('dt_diff').dt,
-            duration_method,
+            gap_dt_unit,
         )().abs() > gap_thresh
     )
 

piker/tsp/_annotate.py

@@ -1,306 +0,0 @@
-# piker: trading gear for hackers
-# Copyright (C) 2018-present  Tyler Goodlet (in stewardship of pikers)
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-"""
-Time-series (remote) annotation APIs.
-
-"""
-from __future__ import annotations
-from math import copysign
-from typing import (
-    Any,
-    TYPE_CHECKING,
-)
-
-import polars as pl
-import tractor
-
-from piker.data._formatters import BGM
-from piker.storage import log
-from piker.ui._style import get_fonts
-
-if TYPE_CHECKING:
-    from piker.ui._remote_ctl import AnnotCtl
-
-
-def humanize_duration(
-    seconds: float,
-) -> str:
-    '''
-    Convert duration in seconds to short human-readable form.
-
-    Uses smallest appropriate time unit:
-    - d: days
-    - h: hours
-    - m: minutes
-    - s: seconds
-
-    Examples:
-    - 86400 -> "1d"
-    - 28800 -> "8h"
-    - 180 -> "3m"
-    - 45 -> "45s"
-
-    '''
-    abs_secs: float = abs(seconds)
-
-    if abs_secs >= 86400:
-        days: float = abs_secs / 86400
-        if days >= 10 or days == int(days):
-            return f'{int(days)}d'
-        return f'{days:.1f}d'
-
-    elif abs_secs >= 3600:
-        hours: float = abs_secs / 3600
-        if hours >= 10 or hours == int(hours):
-            return f'{int(hours)}h'
-        return f'{hours:.1f}h'
-
-    elif abs_secs >= 60:
-        mins: float = abs_secs / 60
-        if mins >= 10 or mins == int(mins):
-            return f'{int(mins)}m'
-        return f'{mins:.1f}m'
-
-    else:
-        if abs_secs >= 10 or abs_secs == int(abs_secs):
-            return f'{int(abs_secs)}s'
-        return f'{abs_secs:.1f}s'
-
-
-async def markup_gaps(
-    fqme: str,
-    timeframe: float,
-    actl: AnnotCtl,
-    wdts: pl.DataFrame,
-    gaps: pl.DataFrame,
-
-    # XXX, switch on to see txt showing a "humanized" label of each
-    # gap's duration.
-    show_txt: bool = False,
-
-) -> dict[int, dict]:
-    '''
-    Remote annotate time-gaps in a dt-fielded ts (normally OHLC)
-    with rectangles.
-
-    '''
-    # XXX: force chart redraw FIRST to ensure PlotItem coordinate
-    # system is properly initialized before we position annotations!
-    # Without this, annotations may be misaligned on first creation
-    # due to Qt/pyqtgraph initialization race conditions.
-    await actl.redraw(
-        fqme=fqme,
-        timeframe=timeframe,
-    )
-
-    aids: dict[int] = {}
-    for i in range(gaps.height):
-        row: pl.DataFrame = gaps[i]
-
-        # the gap's RIGHT-most bar's OPEN value
-        # at that time (sample) step.
-        iend: int = row['index'][0]
-
-        # dt: datetime = row['dt'][0]
-        # dt_prev: datetime = row['dt_prev'][0]
-        # dt_end_t: float = dt.timestamp()
-
-
-        # TODO: can we eventually remove this
-        # once we figure out why the epoch cols
-        # don't match?
-        # TODO: FIX HOW/WHY these aren't matching
-        # and are instead off by 4hours (EST
-        # vs. UTC?!?!)
-        # end_t: float = row['time']
-        # assert (
-        #     dt.timestamp()
-        #     ==
-        #     end_t
-        # )
-
-        # the gap's LEFT-most bar's CLOSE value
-        # at that time (sample) step.
-        prev_r: pl.DataFrame = wdts.filter(
-            pl.col('index') == iend - 1
-        )
-        # XXX: probably a gap in the (newly sorted or de-duplicated)
-        # dt-df, so we might need to re-index first..
-        dt: pl.Series = row['dt']
-        dt_prev: pl.Series = row['dt_prev']
-        if prev_r.is_empty():
-
-            # XXX, filter out any special ignore cases,
-            # - UNIX-epoch stamped datums
-            # - first row
-            if (
-                dt_prev.dt.epoch()[0] == 0
-                or
-                dt.dt.epoch()[0] == 0
-            ):
-                log.warning('Skipping row with UNIX epoch timestamp ??')
-                continue
-
-            if wdts[0]['index'][0] == iend:  # first row
-                log.warning('Skipping first-row (has no previous obvi) !!')
-                continue
-
-            # XXX, if the previous-row by shm-index is missing,
-            # meaning there is a missing sample (set), get the prior
-            # row by df index and attempt to use it?
-            i_wdts: pl.DataFrame = wdts.with_row_index(name='i')
-            i_row: int = i_wdts.filter(pl.col('index') == iend)['i'][0]
-            prev_row_by_i = wdts[i_row]
-            prev_r: pl.DataFrame = prev_row_by_i
-
-            # debug any missing pre-row
-            if tractor._state.is_debug_mode():
-                await tractor.pause()
-
-        istart: int = prev_r['index'][0]
-        # TODO: implement px-col width measure
-        # and ensure at least as many px-cols
-        # shown per rect as configured by user.
-        # gap_w: float = abs((iend - istart))
-        # if gap_w < 6:
-        #     margin: float = 6
-        #     iend += margin
-        #     istart -= margin
-
-        opn: float = row['open'][0]
-        cls: float = prev_r['close'][0]
-
-        # get gap duration for humanized label
-        gap_dur_s: float = row['s_diff'][0]
-        gap_label: str = humanize_duration(gap_dur_s)
-
-        # XXX: get timestamps for server-side index lookup
-        start_time: float = prev_r['time'][0]
-        end_time: float = row['time'][0]
-
-        # BGM=0.16 is the normal diff from overlap between bars, SO
-        # just go slightly "in" from that "between them".
-        from_idx: int = BGM - .06  # = .10
-        lc: tuple[float, float] = (
-            istart + 1 - from_idx,
-            cls,
-        )
-        ro: tuple[float, float] = (
-            iend + from_idx,
-            opn,
-        )
-
-        diff: float = cls - opn
-        sgn: float = copysign(1, diff)
-        up_gap: bool = sgn == -1
-        down_gap: bool = sgn == 1
-        flat: bool = sgn == 0
-
-        color: str = 'dad_blue'
-        # TODO? mks more sense to have up/down coloring?
-        # color: str = {
-        #     -1: 'lilypad_green',  # up-gap
-        #     1: 'wine',  # down-gap
-        # }[sgn]
-
-        rect_kwargs: dict[str, Any] = dict(
-            fqme=fqme,
-            timeframe=timeframe,
-            start_pos=lc,
-            end_pos=ro,
-            color=color,
-            start_time=start_time,
-            end_time=end_time,
-        )
-
-        # add up/down rects
-        aid: int|None = await actl.add_rect(**rect_kwargs)
-        if aid is None:
-            log.error(
-                f'Failed to add rect for,\n'
-                f'{rect_kwargs!r}\n'
-                f'\n'
-                f'Skipping to next gap!\n'
-            )
-            continue
-
-        assert aid
-        aids[aid] = rect_kwargs
-        direction: str = (
-            'down' if down_gap
-            else 'up'
-        )
-        # TODO! mk this a `msgspec.Struct` which we deserialize
-        # on the server side!
-        # XXX: send timestamp for server-side index lookup
-        # to ensure alignment with current shm state
-        gap_time: float = row['time'][0]
-        arrow_kwargs: dict[str, Any] = dict(
-            fqme=fqme,
-            timeframe=timeframe,
-            x=iend,  # fallback if timestamp lookup fails
-            y=cls,
-            time=gap_time,  # for server-side index lookup
-            color=color,
-            alpha=169,
-            pointing=direction,
-            # TODO: expose these as params to markup_gaps()?
-            headLen=10,
-            headWidth=2.222,
-            pxMode=True,
-        )
-
-        aid: int = await actl.add_arrow(
-            **arrow_kwargs
-        )
-
-        # add duration label to RHS of arrow
-        if up_gap:
-            anchor = (0, 0)
-            # ^XXX? i dun get dese dims.. XD
-        elif down_gap:
-            anchor = (0, 1)  # XXX y, x?
-        else:  # no-gap?
-            assert flat
-            anchor = (0, 0)  # up from bottom
-
-        # use a slightly smaller font for gap label txt.
-        font, small_font = get_fonts()
-        font_size: int = small_font.px_size - 1
-        assert isinstance(font_size, int)
-
-        if show_txt:
-            text_aid: int = await actl.add_text(
-                fqme=fqme,
-                timeframe=timeframe,
-                text=gap_label,
-                x=iend + 1,  # fallback if timestamp lookup fails
-                y=cls,
-                time=gap_time,  # server-side index lookup
-                color=color,
-                anchor=anchor,
-                font_size=font_size,
-            )
-            aids[text_aid] = {'text': gap_label}
-
-    # tell chart to redraw all its
-    # graphics view layers Bo
-    await actl.redraw(
-        fqme=fqme,
-        timeframe=timeframe,
-    )
-    return aids

piker/tsp/_dedupe_smart.py

@@ -1,206 +0,0 @@
-'''
-Smart OHLCV deduplication with data quality validation.
-
-Handles concurrent write conflicts by keeping the most complete bar
-(highest volume) while detecting data quality anomalies.
-
-'''
-import polars as pl
-
-from ._anal import with_dts
-
-
-def dedupe_ohlcv_smart(
-    src_df: pl.DataFrame,
-    time_col: str = 'time',
-    volume_col: str = 'volume',
-    sort: bool = True,
-
-) -> tuple[
-    pl.DataFrame,  # with dts
-    pl.DataFrame,  # deduped (keeping higher volume bars)
-    int,  # count of dupes removed
-    pl.DataFrame|None,  # valid race conditions
-    pl.DataFrame|None,  # data quality violations
-]:
-    '''
-    Smart OHLCV deduplication keeping most complete bars.
-
-    For duplicate timestamps, keeps bar with highest volume under
-    the assumption that higher volume indicates more complete/final
-    data from backfill vs partial live updates.
-
-    Returns
-    -------
-    Tuple of:
-    - wdts: original dataframe with datetime columns added
-    - deduped: deduplicated frame keeping highest-volume bars
-    - diff: number of duplicate rows removed
-    - valid_races: duplicates meeting expected race condition pattern
-      (volume monotonic, OHLC ranges valid)
-    - data_quality_issues: duplicates violating expected relationships
-      indicating provider data problems
-
-    '''
-    wdts: pl.DataFrame = with_dts(src_df)
-
-    # Find duplicate timestamps
-    dupes: pl.DataFrame = wdts.filter(
-        pl.col(time_col).is_duplicated()
-    )
-
-    if dupes.is_empty():
-        # No duplicates, return as-is
-        return (wdts, wdts, 0, None, None)
-
-    # Analyze duplicate groups for validation
-    dupe_analysis: pl.DataFrame = (
-        dupes
-        .sort([time_col, 'index'])
-        .group_by(time_col, maintain_order=True)
-        .agg([
-            pl.col('index').alias('indices'),
-            pl.col('volume').alias('volumes'),
-            pl.col('high').alias('highs'),
-            pl.col('low').alias('lows'),
-            pl.col('open').alias('opens'),
-            pl.col('close').alias('closes'),
-            pl.col('dt').first().alias('dt'),
-            pl.len().alias('count'),
-        ])
-    )
-
-    # Validate OHLCV monotonicity for each duplicate group
-    def check_ohlcv_validity(row) -> dict[str, bool]:
-        '''
-        Check if duplicate bars follow expected race condition pattern.
-
-        For a valid live-update → backfill race:
-        - volume should be monotonically increasing
-        - high should be monotonically non-decreasing
-        - low should be monotonically non-increasing
-        - open should be identical (fixed at bar start)
-
-        Returns dict of violation flags.
-
-        '''
-        vols: list = row['volumes']
-        highs: list = row['highs']
-        lows: list = row['lows']
-        opens: list = row['opens']
-
-        violations: dict[str, bool] = {
-            'volume_non_monotonic': False,
-            'high_decreased': False,
-            'low_increased': False,
-            'open_mismatch': False,
-            'identical_bars': False,
-        }
-
-        # Check if all bars are identical (pure duplicate)
-        if (
-            len(set(vols)) == 1
-            and len(set(highs)) == 1
-            and len(set(lows)) == 1
-            and len(set(opens)) == 1
-        ):
-            violations['identical_bars'] = True
-            return violations
-
-        # Check volume monotonicity
-        for i in range(1, len(vols)):
-            if vols[i] < vols[i-1]:
-                violations['volume_non_monotonic'] = True
-                break
-
-        # Check high monotonicity (can only increase or stay same)
-        for i in range(1, len(highs)):
-            if highs[i] < highs[i-1]:
-                violations['high_decreased'] = True
-                break
-
-        # Check low monotonicity (can only decrease or stay same)
-        for i in range(1, len(lows)):
-            if lows[i] > lows[i-1]:
-                violations['low_increased'] = True
-                break
-
-        # Check open consistency (should be fixed)
-        if len(set(opens)) > 1:
-            violations['open_mismatch'] = True
-
-        return violations
-
-    # Apply validation
-    dupe_analysis = dupe_analysis.with_columns([
-        pl.struct(['volumes', 'highs', 'lows', 'opens'])
-        .map_elements(
-            check_ohlcv_validity,
-            return_dtype=pl.Struct([
-                pl.Field('volume_non_monotonic', pl.Boolean),
-                pl.Field('high_decreased', pl.Boolean),
-                pl.Field('low_increased', pl.Boolean),
-                pl.Field('open_mismatch', pl.Boolean),
-                pl.Field('identical_bars', pl.Boolean),
-            ])
-        )
-        .alias('validity')
-    ])
-
-    # Unnest validity struct
-    dupe_analysis = dupe_analysis.unnest('validity')
-
-    # Separate valid races from data quality issues
-    valid_races: pl.DataFrame|None = (
-        dupe_analysis
-        .filter(
-            # Valid if no violations OR just identical bars
-            ~pl.col('volume_non_monotonic')
-            & ~pl.col('high_decreased')
-            & ~pl.col('low_increased')
-            & ~pl.col('open_mismatch')
-        )
-    )
-    if valid_races.is_empty():
-        valid_races = None
-
-    data_quality_issues: pl.DataFrame|None = (
-        dupe_analysis
-        .filter(
-            # Issues if any non-identical violation exists
-            (
-                pl.col('volume_non_monotonic')
-                | pl.col('high_decreased')
-                | pl.col('low_increased')
-                | pl.col('open_mismatch')
-            )
-            & ~pl.col('identical_bars')
-        )
-    )
-    if data_quality_issues.is_empty():
-        data_quality_issues = None
-
-    # Deduplicate: keep highest volume bar for each timestamp
-    deduped: pl.DataFrame = (
-        wdts
-        .sort([time_col, volume_col])
-        .unique(
-            subset=[time_col],
-            keep='last',
-            maintain_order=False,
-        )
-    )
-
-    # Re-sort by time or index
-    if sort:
-        deduped = deduped.sort(by=time_col)
-
-    diff: int = wdts.height - deduped.height
-
-    return (
-        wdts,
-        deduped,
-        diff,
-        valid_races,
-        data_quality_issues,
-    )

piker/types.py

@@ -21,6 +21,230 @@ Extensions to built-in or (heavily used but 3rd party) friend-lib
 types.
 
 '''
-from tractor.msg.pretty_struct import (
+from __future__ import annotations
-    Struct as Struct,
+from collections import UserList
+from pprint import (
+    saferepr,
 )
+from typing import Any
+
+from msgspec import (
+    msgpack,
+    Struct as _Struct,
+    structs,
+)
+
+
+class DiffDump(UserList):
+    '''
+    Very simple list delegator that repr() dumps (presumed) tuple
+    elements of the form `tuple[str, Any, Any]` in a nice
+    multi-line readable form for analyzing `Struct` diffs.
+
+    '''
+    def __repr__(self) -> str:
+        if not len(self):
+            return super().__repr__()
+
+        # format by displaying item pair's ``repr()`` on multiple,
+        # indented lines such that they are more easily visually
+        # comparable when printed to console when printed to
+        # console.
+        repstr: str = '[\n'
+        for k, left, right in self:
+            repstr += (
+                f'({k},\n'
+                f'\t{repr(left)},\n'
+                f'\t{repr(right)},\n'
+                ')\n'
+            )
+        repstr += ']\n'
+        return repstr
+
+
+class Struct(
+    _Struct,
+
+    # https://jcristharif.com/msgspec/structs.html#tagged-unions
+    # tag='pikerstruct',
+    # tag=True,
+):
+    '''
+    A "human friendlier" (aka repl buddy) struct subtype.
+
+    '''
+    def _sin_props(self) -> Iterator[
+        tuple[
+            structs.FieldIinfo,
+            str,
+            Any,
+        ]
+    ]:
+        '''
+        Iterate over all non-@property fields of this struct.
+
+        '''
+        fi: structs.FieldInfo
+        for fi in structs.fields(self):
+            key: str = fi.name
+            val: Any = getattr(self, key)
+            yield fi, key, val
+
+    def to_dict(
+        self,
+        include_non_members: bool = True,
+
+    ) -> dict:
+        '''
+        Like it sounds.. direct delegation to:
+        https://jcristharif.com/msgspec/api.html#msgspec.structs.asdict
+
+        BUT, by default we pop all non-member (aka not defined as
+        struct fields) fields by default.
+
+        '''
+        asdict: dict = structs.asdict(self)
+        if include_non_members:
+            return asdict
+
+        # only return a dict of the struct members
+        # which were provided as input, NOT anything
+        # added as type-defined `@property` methods!
+        sin_props: dict = {}
+        fi: structs.FieldInfo
+        for fi, k, v in self._sin_props():
+            sin_props[k] = asdict[k]
+
+        return sin_props
+
+    def pformat(
+        self,
+        field_indent: int = 2,
+        indent: int = 0,
+
+    ) -> str:
+        '''
+        Recursion-safe `pprint.pformat()` style formatting of
+        a `msgspec.Struct` for sane reading by a human using a REPL.
+
+        '''
+        # global whitespace indent
+        ws: str = ' '*indent
+
+        # field whitespace indent
+        field_ws: str = ' '*(field_indent + indent)
+
+        # qtn: str = ws + self.__class__.__qualname__
+        qtn: str = self.__class__.__qualname__
+
+        obj_str: str = ''  # accumulator
+        fi: structs.FieldInfo
+        k: str
+        v: Any
+        for fi, k, v in self._sin_props():
+
+            # TODO: how can we prefer `Literal['option1',  'option2,
+            # ..]` over .__name__ == `Literal` but still get only the
+            # latter for simple types like `str | int | None` etc..?
+            ft: type = fi.type
+            typ_name: str = getattr(ft, '__name__', str(ft))
+
+            # recurse to get sub-struct's `.pformat()` output Bo
+            if isinstance(v, Struct):
+                val_str: str =  v.pformat(
+                    indent=field_indent + indent,
+                    field_indent=indent + field_indent,
+                )
+
+            else:  # the `pprint` recursion-safe format:
+                # https://docs.python.org/3.11/library/pprint.html#pprint.saferepr
+                val_str: str = saferepr(v)
+
+            obj_str += (field_ws + f'{k}: {typ_name} = {val_str},\n')
+
+        return (
+            f'{qtn}(\n'
+            f'{obj_str}'
+            f'{ws})'
+        )
+
+    # TODO: use a pprint.PrettyPrinter instance around ONLY rendering
+    # inside a known tty?
+    # def __repr__(self) -> str:
+    #     ...
+
+    # __str__ = __repr__ = pformat
+    __repr__ = pformat
+
+    def copy(
+        self,
+        update: dict | None = None,
+
+    ) -> Struct:
+        '''
+        Validate-typecast all self defined fields, return a copy of
+        us with all such fields.
+
+        NOTE: This is kinda like the default behaviour in
+        `pydantic.BaseModel` except a copy of the object is
+        returned making it compat with `frozen=True`.
+
+        '''
+        if update:
+            for k, v in update.items():
+                setattr(self, k, v)
+
+        # NOTE: roundtrip serialize to validate
+        # - enode to msgpack binary format,
+        # - decode that back to a struct.
+        return msgpack.Decoder(type=type(self)).decode(
+            msgpack.Encoder().encode(self)
+        )
+
+    def typecast(
+        self,
+
+        # TODO: allow only casting a named subset?
+        # fields: set[str] | None = None,
+
+    ) -> None:
+        '''
+        Cast all fields using their declared type annotations
+        (kinda like what `pydantic` does by default).
+
+        NOTE: this of course won't work on frozen types, use
+        ``.copy()`` above in such cases.
+
+        '''
+        # https://jcristharif.com/msgspec/api.html#msgspec.structs.fields
+        fi: structs.FieldInfo
+        for fi in structs.fields(self):
+            setattr(
+                self,
+                fi.name,
+                fi.type(getattr(self, fi.name)),
+            )
+
+    def __sub__(
+        self,
+        other: Struct,
+
+    ) -> DiffDump[tuple[str, Any, Any]]:
+        '''
+        Compare fields/items key-wise and return a ``DiffDump``
+        for easy visual REPL comparison B)
+
+        '''
+        diffs: DiffDump[tuple[str, Any, Any]] = DiffDump()
+        for fi in structs.fields(self):
+            attr_name: str = fi.name
+            ours: Any = getattr(self, attr_name)
+            theirs: Any = getattr(other, attr_name)
+            if ours != theirs:
+                diffs.append((
+                    attr_name,
+                    ours,
+                    theirs,
+                ))
+
+        return diffs

piker/ui/_app.py

@@ -27,18 +27,15 @@ import trio
 from piker.ui.qt import (
     QEvent,
 )
-from . import _chart
-from . import _event
-from . import _search
-from ..accounting import unpack_fqme
-from ..data._symcache import open_symcache
-from ..data.feed import install_brokerd_search
-from ..log import (
-    get_logger,
-    get_console_log,
-)
 from ..service import maybe_spawn_brokerd
+from . import _event
 from ._exec import run_qtractor
+from ..data.feed import install_brokerd_search
+from ..data._symcache import open_symcache
+from ..accounting import unpack_fqme
+from . import _search
+from ._chart import GodWidget
+from ..log import get_logger
 
 log = get_logger(__name__)
 
@@ -76,8 +73,8 @@ async def load_provider_search(
 
 async def _async_main(
 
-    # implicit required argument provided by `qtractor_run()`
+    # implicit required argument provided by ``qtractor_run()``
-    main_widget: _chart.GodWidget,
+    main_widget: GodWidget,
 
     syms: list[str],
     brokers: dict[str, ModuleType],
@@ -90,16 +87,6 @@ async def _async_main(
     Provision the "main" widget with initial symbol data and root nursery.
 
     """
-    # enable chart's console logging
-    if loglevel:
-        get_console_log(
-            level=loglevel,
-            name=__name__,
-        )
-
-    # set as singleton
-    _chart._godw = main_widget
-
     from . import _display
     from ._pg_overrides import _do_overrides
     _do_overrides()
@@ -214,6 +201,6 @@ def _main(
             brokermods,
             piker_loglevel,
         ),
-        main_widget_type=_chart.GodWidget,
+        main_widget_type=GodWidget,
         tractor_kwargs=tractor_kwargs,
     )

piker/ui/_chart.py

@@ -29,6 +29,7 @@ from typing import (
 )
 
 import pyqtgraph as pg
+import trio
 
 from piker.ui.qt import (
     QtCore,
@@ -40,7 +41,6 @@ from piker.ui.qt import (
     QVBoxLayout,
     QSplitter,
 )
-from ._widget import GodWidget
 from ._axes import (
     DynamicDateAxis,
     PriceAxis,
@@ -61,6 +61,10 @@ from ._style import (
     _xaxis_at,
     # _min_points_to_show,
 )
+from ..data.feed import (
+    Feed,
+    Flume,
+)
 from ..accounting import (
     MktPair,
 )
@@ -74,12 +78,286 @@ from . import _pg_overrides as pgo
 
 if TYPE_CHECKING:
     from ._display import DisplayState
-    from ..data.flows import Flume
-    from ..data.feed import Feed
 
 log = get_logger(__name__)
 
 
+class GodWidget(QWidget):
+    '''
+    "Our lord and savior, the holy child of window-shua, there is no
+    widget above thee." - 6|6
+
+    The highest level composed widget which contains layouts for
+    organizing charts as well as other sub-widgets used to control or
+    modify them.
+
+    '''
+    search: SearchWidget
+    mode_name: str = 'god'
+
+    def __init__(
+
+        self,
+        parent=None,
+
+    ) -> None:
+
+        super().__init__(parent)
+
+        self.search: SearchWidget | None = None
+
+        self.hbox = QHBoxLayout(self)
+        self.hbox.setContentsMargins(0, 0, 0, 0)
+        self.hbox.setSpacing(6)
+        self.hbox.setAlignment(Qt.AlignTop)
+
+        self.vbox = QVBoxLayout()
+        self.vbox.setContentsMargins(0, 0, 0, 0)
+        self.vbox.setSpacing(2)
+        self.vbox.setAlignment(Qt.AlignTop)
+
+        self.hbox.addLayout(self.vbox)
+
+        self._chart_cache: dict[
+            str,
+            tuple[LinkedSplits, LinkedSplits],
+        ] = {}
+
+        self.hist_linked: LinkedSplits | None = None
+        self.rt_linked: LinkedSplits | None = None
+        self._active_cursor: Cursor | None = None
+
+        # assigned in the startup func `_async_main()`
+        self._root_n: trio.Nursery = None
+
+        self._widgets: dict[str, QWidget] = {}
+        self._resizing: bool = False
+
+        # TODO: do we need this, when would god get resized
+        # and the window does not? Never right?!
+        # self.reg_for_resize(self)
+
+    # TODO: strat loader/saver that we don't need yet.
+    # def init_strategy_ui(self):
+    #     self.toolbar_layout = QHBoxLayout()
+    #     self.toolbar_layout.setContentsMargins(0, 0, 0, 0)
+    #     self.vbox.addLayout(self.toolbar_layout)
+    #     self.strategy_box = StrategyBoxWidget(self)
+    #     self.toolbar_layout.addWidget(self.strategy_box)
+
+    @property
+    def linkedsplits(self) -> LinkedSplits:
+        return self.rt_linked
+
+    def set_chart_symbols(
+        self,
+        group_key: tuple[str],  # of form <fqme>.<providername>
+        all_linked: tuple[LinkedSplits, LinkedSplits],  # type: ignore
+
+    ) -> None:
+        # re-sort org cache symbol list in LIFO order
+        cache = self._chart_cache
+        cache.pop(group_key, None)
+        cache[group_key] = all_linked
+
+    def get_chart_symbols(
+        self,
+        symbol_key: str,
+
+    ) -> tuple[LinkedSplits, LinkedSplits]:  # type: ignore
+        return self._chart_cache.get(symbol_key)
+
+    async def load_symbols(
+        self,
+        fqmes: list[str],
+        loglevel: str,
+        reset: bool = False,
+
+    ) -> trio.Event:
+        '''
+        Load a new contract into the charting app.
+
+        Expects a ``numpy`` structured array containing all the ohlcv fields.
+
+        '''
+        # NOTE: for now we use the first symbol in the set as the "key"
+        # for the overlay of feeds on the chart.
+        group_key: tuple[str] = tuple(fqmes)
+
+        all_linked = self.get_chart_symbols(group_key)
+        order_mode_started = trio.Event()
+
+        if not self.vbox.isEmpty():
+
+            # XXX: seems to make switching slower?
+            # qframe = self.hist_linked.chart.qframe
+            # if qframe.sidepane is self.search:
+            #     qframe.hbox.removeWidget(self.search)
+
+            for linked in [self.rt_linked, self.hist_linked]:
+                # XXX: this is CRITICAL especially with pixel buffer caching
+                linked.hide()
+                linked.unfocus()
+
+                # XXX: pretty sure we don't need this
+                # remove any existing plots?
+                # XXX: ahh we might want to support cache unloading..
+                # self.vbox.removeWidget(linked)
+
+        # switching to a new viewable chart
+        if all_linked is None or reset:
+            from ._display import display_symbol_data
+
+            # we must load a fresh linked charts set
+            self.rt_linked = rt_charts = LinkedSplits(self)
+            self.hist_linked = hist_charts = LinkedSplits(self)
+
+            # spawn new task to start up and update new sub-chart instances
+            self._root_n.start_soon(
+                display_symbol_data,
+                self,
+                fqmes,
+                loglevel,
+                order_mode_started,
+            )
+
+            # self.vbox.addWidget(hist_charts)
+            self.vbox.addWidget(rt_charts)
+            self.set_chart_symbols(
+                group_key,
+                (hist_charts, rt_charts),
+            )
+
+            for linked in [hist_charts, rt_charts]:
+                linked.show()
+                linked.focus()
+
+            await trio.sleep(0)
+
+        else:
+            # symbol is already loaded and ems ready
+            order_mode_started.set()
+
+            self.hist_linked, self.rt_linked = all_linked
+
+            for linked in all_linked:
+                # TODO:
+                # - we'll probably want per-instrument/provider state here?
+                #   change the order config form over to the new chart
+
+                # chart is already in memory so just focus it
+                linked.show()
+                linked.focus()
+                linked.graphics_cycle()
+                await trio.sleep(0)
+
+                # resume feeds *after* rendering chart view asap
+                chart = linked.chart
+                if chart:
+                    chart.resume_all_feeds()
+
+            # TODO: we need a check to see if the chart
+            # last had the xlast in view, if so then shift so it's
+            # still in view, if the user was viewing history then
+            # do nothing yah?
+            self.rt_linked.chart.main_viz.default_view(
+                do_min_bars=True,
+            )
+
+        # if a history chart instance is already up then
+        # set the search widget as its sidepane.
+        hist_chart = self.hist_linked.chart
+        if hist_chart:
+            hist_chart.qframe.set_sidepane(self.search)
+
+            # NOTE: this is really stupid/hard to follow.
+            # we have to reposition the active position nav
+            # **AFTER** applying the search bar as a sidepane
+            # to the newly switched to symbol.
+            await trio.sleep(0)
+
+            # TODO: probably stick this in some kinda `LooknFeel` API?
+            for tracker in self.rt_linked.mode.trackers.values():
+                pp_nav = tracker.nav
+                if tracker.live_pp.cumsize:
+                    pp_nav.show()
+                    pp_nav.hide_info()
+                else:
+                    pp_nav.hide()
+
+        # set window titlebar info
+        symbol = self.rt_linked.mkt
+        if symbol is not None:
+            self.window.setWindowTitle(
+                f'{symbol.fqme} '
+                f'tick:{symbol.size_tick}'
+            )
+
+        return order_mode_started
+
+    def focus(self) -> None:
+        '''
+        Focus the top level widget which in turn focusses the chart
+        ala "view mode".
+
+        '''
+        # go back to view-mode focus (aka chart focus)
+        self.clearFocus()
+        chart = self.rt_linked.chart
+        if chart:
+            chart.setFocus()
+
+    def reg_for_resize(
+        self,
+        widget: QWidget,
+    ) -> None:
+        getattr(widget, 'on_resize')
+        self._widgets[widget.mode_name] = widget
+
+    def on_win_resize(self, event: QtCore.QEvent) -> None:
+        '''
+        Top level god widget handler from window (the real yaweh) resize
+        events such that any registered widgets which wish to be
+        notified are invoked using our pythonic `.on_resize()` method
+        api.
+
+        Where we do UX magic to make things not suck B)
+
+        '''
+        if self._resizing:
+            return
+
+        self._resizing = True
+
+        log.info('God widget resize')
+        for name, widget in self._widgets.items():
+            widget.on_resize()
+
+        self._resizing = False
+
+    # on_resize = on_win_resize
+
+    def get_cursor(self) -> Cursor:
+        return self._active_cursor
+
+    def iter_linked(self) -> Iterator[LinkedSplits]:
+        for linked in [self.hist_linked, self.rt_linked]:
+            yield linked
+
+    def resize_all(self) -> None:
+        '''
+        Dynamic resize sequence: adjusts all sub-widgets/charts to
+        sensible default ratios of what space is detected as available
+        on the display / window.
+
+        '''
+        rt_linked = self.rt_linked
+        rt_linked.set_split_sizes()
+        self.rt_linked.resize_sidepanes()
+        self.hist_linked.resize_sidepanes(from_linked=rt_linked)
+        self.search.on_resize()
+
+
 class ChartnPane(QFrame):
     '''
     One-off ``QFrame`` composite which pairs a chart
@@ -91,9 +369,9 @@ class ChartnPane(QFrame):
     https://doc.qt.io/qt-5/qwidget.html#composite-widgets
 
     '''
-    sidepane: FieldsForm|SearchWidget
+    sidepane: FieldsForm | SearchWidget
     hbox: QHBoxLayout
-    chart: ChartPlotWidget|None = None
+    chart: ChartPlotWidget | None = None
 
     def __init__(
         self,
@@ -109,13 +387,13 @@ class ChartnPane(QFrame):
         self.chart = None
 
         hbox = self.hbox = QHBoxLayout(self)
-        hbox.setAlignment(Qt.AlignTop|Qt.AlignLeft)
+        hbox.setAlignment(Qt.AlignTop | Qt.AlignLeft)
         hbox.setContentsMargins(0, 0, 0, 0)
         hbox.setSpacing(3)
 
     def set_sidepane(
         self,
-        sidepane: FieldsForm|SearchWidget,
+        sidepane: FieldsForm | SearchWidget,
     ) -> None:
 
         # add sidepane **after** chart; place it on axis side
@@ -126,7 +404,7 @@ class ChartnPane(QFrame):
         self._sidepane = sidepane
 
     @property
-    def sidepane(self) -> FieldsForm|SearchWidget:
+    def sidepane(self) -> FieldsForm | SearchWidget:
         return self._sidepane
 
 
@@ -141,6 +419,7 @@ class LinkedSplits(QWidget):
 
     '''
     def __init__(
+
         self,
         godwidget: GodWidget,
 
@@ -171,7 +450,7 @@ class LinkedSplits(QWidget):
         # chart-local graphics state that can be passed to
         # a ``graphic_update_cycle()`` call by any task wishing to
         # update the UI for a given "chart instance".
-        self.display_state: DisplayState|None = None
+        self.display_state: DisplayState | None = None
 
         self._mkt: MktPair = None
 
@@ -207,7 +486,7 @@ class LinkedSplits(QWidget):
 
     def set_split_sizes(
         self,
-        prop: float|None = None,
+        prop: float | None = None,
 
     ) -> None:
         '''
@@ -288,8 +567,8 @@ class LinkedSplits(QWidget):
 
         # style?
         self.chart.setFrameStyle(
-            QFrame.Shape.StyledPanel
+            QFrame.Shape.StyledPanel |
-            |QFrame.Shadow.Plain
+            QFrame.Shadow.Plain
         )
 
         return self.chart
@@ -301,11 +580,11 @@ class LinkedSplits(QWidget):
         shm: ShmArray,
         flume: Flume,
 
-        array_key: str|None = None,
+        array_key: str | None = None,
         style: str = 'line',
         _is_main: bool = False,
 
-        sidepane: QWidget|None = None,
+        sidepane: QWidget | None = None,
         draw_kwargs: dict = {},
 
         **cpw_kwargs,
@@ -408,7 +687,7 @@ class LinkedSplits(QWidget):
         cpw.plotItem.vb.linked = self
         cpw.setFrameStyle(
             QFrame.Shape.StyledPanel
-            # |QFrame.Shadow.Plain
+            # | QFrame.Shadow.Plain
         )
 
         # don't show the little "autoscale" A label.
@@ -521,7 +800,7 @@ class LinkedSplits(QWidget):
 
     def resize_sidepanes(
         self,
-        from_linked: LinkedSplits|None = None,
+        from_linked: LinkedSplits | None = None,
 
     ) -> None:
         '''
@@ -595,7 +874,7 @@ class ChartPlotWidget(pg.PlotWidget):
         # TODO: load from config
         use_open_gl: bool = False,
 
-        static_yrange: tuple[float, float]|None = None,
+        static_yrange: tuple[float, float] | None = None,
 
         parent=None,
         **kwargs,
@@ -610,7 +889,7 @@ class ChartPlotWidget(pg.PlotWidget):
 
         # NOTE: must be set bfore calling ``.mk_vb()``
         self.linked = linkedsplits
-        self.sidepane: FieldsForm|None = None
+        self.sidepane: FieldsForm | None = None
 
         # source of our custom interactions
         self.cv = self.mk_vb(name)
@@ -644,7 +923,7 @@ class ChartPlotWidget(pg.PlotWidget):
         self.useOpenGL(use_open_gl)
         self.name = name
         self.data_key = data_key or name
-        self.qframe: ChartnPane|None = None
+        self.qframe: ChartnPane | None = None
 
         # scene-local placeholder for book graphics
         # sizing to avoid overlap with data contents
@@ -655,7 +934,7 @@ class ChartPlotWidget(pg.PlotWidget):
         # registry of overlay curve names
         self._vizs: dict[str, Viz] = {}
 
-        self.feed: Feed|None = None
+        self.feed: Feed | None = None
 
         self._labels = {}  # registry of underlying graphics
         self._ysticks = {}  # registry of underlying graphics
@@ -748,11 +1027,11 @@ class ChartPlotWidget(pg.PlotWidget):
     def increment_view(
         self,
         datums: int = 1,
-        vb: ChartView|None = None,
+        vb: ChartView | None = None,
 
     ) -> None:
         '''
-        Increment the data view `datums`` steps toward y-axis thus
+        Increment the data view ``datums``` steps toward y-axis thus
         "following" the current time slot/step/bar.
 
         '''
@@ -762,7 +1041,7 @@ class ChartPlotWidget(pg.PlotWidget):
         x_shift = viz.index_step() * datums
 
         if datums >= 300:
-            log.warning('FUCKING FIX THE GLOBAL STEP BULLSHIT')
+            print("FUCKING FIX THE GLOBAL STEP BULLSHIT")
             # breakpoint()
             return
 
@@ -779,8 +1058,8 @@ class ChartPlotWidget(pg.PlotWidget):
     def overlay_plotitem(
         self,
         name: str,
-        index: int|None = None,
+        index: int | None = None,
-        axis_title: str|None = None,
+        axis_title: str | None = None,
         axis_side: str = 'right',
         axis_kwargs: dict = {},
 
@@ -868,14 +1147,14 @@ class ChartPlotWidget(pg.PlotWidget):
         shm: ShmArray,
         flume: Flume,
 
-        array_key: str|None = None,
+        array_key: str | None = None,
         overlay: bool = False,
-        color: str|None = None,
+        color: str | None = None,
         add_label: bool = True,
-        pi: pg.PlotItem|None = None,
+        pi: pg.PlotItem | None = None,
         step_mode: bool = False,
         is_ohlc: bool = False,
-        add_sticky: None|str = 'right',
+        add_sticky: None | str = 'right',
 
         **graphics_kwargs,
 
@@ -973,7 +1252,7 @@ class ChartPlotWidget(pg.PlotWidget):
                 # use the tick size precision for display
                 name = name or pi.name
                 mkt: MktPair = self.linked.mkt
-                digits: int|None = None
+                digits: int | None = None
                 if name in mkt.fqme:
                     digits = mkt.price_tick_digits
 
@@ -1007,7 +1286,7 @@ class ChartPlotWidget(pg.PlotWidget):
         shm: ShmArray,
         flume: Flume,
 
-        array_key: str|None = None,
+        array_key: str | None = None,
         **draw_curve_kwargs,
 
     ) -> Viz:

piker/ui/_cursor.py

@@ -413,18 +413,9 @@ class Cursor(pg.GraphicsObject):
         self,
         item: pg.GraphicsObject,
     ) -> None:
-        assert getattr(
+        assert getattr(item, 'delete'), f"{item} must define a ``.delete()``"
-            item,
-            'delete',
-        ), f"{item} must define a ``.delete()``"
         self._hovered.add(item)
 
-    def is_hovered(
-        self,
-        item: pg.GraphicsObject,
-    ) -> bool:
-        return item in self._hovered
-
     def add_plot(
         self,
         plot: ChartPlotWidget,  # noqa

piker/ui/_curve.py

@@ -27,6 +27,7 @@ import pyqtgraph as pg
 
 from piker.ui.qt import (
     QtWidgets,
+    QGraphicsItem,
     Qt,
     QLineF,
     QRectF,

piker/ui/_dataviz.py

@@ -45,7 +45,7 @@ from piker.ui.qt import QLineF
 from ..data._sharedmem import (
     ShmArray,
 )
-from ..data.flows import Flume
+from ..data.feed import Flume
 from ..data._formatters import (
     IncrementalFormatter,
     OHLCBarsFmtr,  # Plain OHLC renderer

piker/ui/_display.py

@@ -21,7 +21,6 @@ this module ties together quote and computational (fsp) streams with
 graphics update methods via our custom ``pyqtgraph`` charting api.
 
 '''
-from functools import partial
 import itertools
 from math import floor
 import time
@@ -209,7 +208,6 @@ class DisplayState(Struct):
 async def increment_history_view(
     # min_istream: tractor.MsgStream,
     ds: DisplayState,
-    loglevel: str = 'warning',
 ):
     hist_chart: ChartPlotWidget = ds.hist_chart
     hist_viz: Viz = ds.hist_viz
@@ -231,10 +229,7 @@ async def increment_history_view(
         hist_viz.reset_graphics()
         # hist_viz.update_graphics(force_redraw=True)
 
-    async with open_sample_stream(
+    async with open_sample_stream(1.) as min_istream:
-        period_s=1.,
-        loglevel=loglevel,
-    ) as min_istream:
         async for msg in min_istream:
 
             profiler = Profiler(
@@ -315,6 +310,7 @@ async def increment_history_view(
 
 
 async def graphics_update_loop(
+
     dss: dict[str, DisplayState],
     nurse: trio.Nursery,
     godwidget: GodWidget,
@@ -323,7 +319,6 @@ async def graphics_update_loop(
 
     pis: dict[str, list[pgo.PlotItem, pgo.PlotItem]] = {},
     vlm_charts: dict[str, ChartPlotWidget] = {},
-    loglevel: str = 'warning',
 
 ) -> None:
     '''
@@ -467,12 +462,9 @@ async def graphics_update_loop(
         # })
 
         nurse.start_soon(
-            partial(
+            increment_history_view,
-                increment_history_view,
+            # min_istream,
-                # min_istream,
+            ds,
-                ds=ds,
-                loglevel=loglevel,
-            ),
         )
         await trio.sleep(0)
 
@@ -519,19 +511,14 @@ async def graphics_update_loop(
                     fast_chart.linked.isHidden()
                     or not rt_pi.isVisible()
                 ):
-                    log.debug(
+                    print(f'{fqme} skipping update for HIDDEN CHART')
-                        f'{fqme} skipping update for HIDDEN CHART'
-                    )
                     fast_chart.pause_all_feeds()
                     continue
 
                 ic = fast_chart.view._in_interact
                 if ic:
                     fast_chart.pause_all_feeds()
-                    log.debug(
+                    print(f'{fqme} PAUSING DURING INTERACTION')
-                        f'Pausing chart updaates during interaction\n'
-                        f'fqme: {fqme!r}'
-                    )
                     await ic.wait()
                     fast_chart.resume_all_feeds()
 
@@ -1604,18 +1591,15 @@ async def display_symbol_data(
             # start update loop task
             dss: dict[str, DisplayState] = {}
             ln.start_soon(
-                partial(
+                graphics_update_loop,
-                    graphics_update_loop,
+                dss,
-                    dss=dss,
+                ln,
-                    nurse=ln,
+                godwidget,
-                    godwidget=godwidget,
+                feed,
-                    feed=feed,
+                # min_istream,
-                    # min_istream,
 
-                    pis=pis,
+                pis,
-                    vlm_charts=vlm_charts,
+                vlm_charts,
-                    loglevel=loglevel,
-                )
             )
 
             # boot order-mode

piker/ui/_editors.py

@@ -21,7 +21,6 @@ Higher level annotation editors.
 from __future__ import annotations
 from collections import defaultdict
 from typing import (
-    Literal,
     Sequence,
     TYPE_CHECKING,
 )
@@ -55,11 +54,6 @@ from ._style import (
 from ._lines import LevelLine
 from ..log import get_logger
 
-# TODO, rm the cycle here!
-from ._widget import (
-    GodWidget,
-)
-
 if TYPE_CHECKING:
     from ._chart import (
         GodWidget,
@@ -72,18 +66,9 @@ log = get_logger(__name__)
 
 
 class ArrowEditor(Struct):
-    '''
-    Annotate a chart-view with arrows most often used for indicating,
-    - order txns/clears,
-    - positions directions,
-    - general points-of-interest like nooz events.
 
-    '''
     godw: GodWidget = None  # type: ignore # noqa
-    _arrows: dict[
+    _arrows: dict[str, list[pg.ArrowItem]] = {}
-        str,
-        list[pg.ArrowItem]
-    ] = {}
 
     def add(
         self,
@@ -91,19 +76,8 @@ class ArrowEditor(Struct):
         uid: str,
         x: float,
         y: float,
-        color: str|None = None,
+        color: str = 'default',
-        pointing: Literal[
+        pointing: str | None = None,
-            'up',
-            'down',
-            None,
-        ] = None,
-        alpha: int = 255,
-        zval: float = 1e9,
-        headLen: float|None = None,
-        headWidth: float|None = None,
-        tailLen: float|None = None,
-        tailWidth: float|None = None,
-        pxMode: bool = True,
 
     ) -> pg.ArrowItem:
         '''
@@ -119,83 +93,29 @@ class ArrowEditor(Struct):
         # scale arrow sizing to dpi-aware font
         size = _font.font.pixelSize() * 0.8
 
-        # allow caller override of head dimensions
-        if headLen is None:
-            headLen = size
-        if headWidth is None:
-            headWidth = size/2
-        # tail params default to None (no tail)
-        if tailWidth is None:
-            tailWidth = 3
-
-        color = color or 'default'
-        color = QColor(hcolor(color))
-        color.setAlpha(alpha)
-        pen = fn.mkPen(color, width=1)
-        brush = fn.mkBrush(color)
         arrow = pg.ArrowItem(
             angle=angle,
             baseAngle=0,
-            headLen=headLen,
+            headLen=size,
-            headWidth=headWidth,
+            headWidth=size/2,
-            tailLen=tailLen,
+            tailLen=None,
-            tailWidth=tailWidth,
+            pxMode=True,
-            pxMode=pxMode,
-            # coloring
-            pen=pen,
-            brush=brush,
-        )
-        arrow.setZValue(zval)
-        arrow.setPos(x, y)
-        plot.addItem(arrow)  # render to view
 
-        # register for removal
+            # coloring
-        arrow._uid = uid
+            pen=pg.mkPen(hcolor('papas_special')),
-        self._arrows.setdefault(
+            brush=pg.mkBrush(hcolor(color)),
-            uid, []
+        )
-        ).append(arrow)
+        arrow.setPos(x, y)
+        self._arrows.setdefault(uid, []).append(arrow)
+
+        # render to view
+        plot.addItem(arrow)
 
         return arrow
 
-    def remove(
+    def remove(self, arrow) -> bool:
-        self,
-        arrow: pg.ArrowItem,
-    ) -> None:
-        '''
-        Remove a *single arrow* from all chart views to which it was
-        added.
-
-        '''
-        uid: str = arrow._uid
-        arrows: list[pg.ArrowItem] = self._arrows[uid]
-        log.info(
-            f'Removing arrow from views\n'
-            f'uid: {uid!r}\n'
-            f'{arrow!r}\n'
-        )
         for linked in self.godw.iter_linked():
-            if not (chart := linked.chart):
+            linked.chart.plotItem.removeItem(arrow)
-                continue
-
-            chart.plotItem.removeItem(arrow)
-        try:
-            arrows.remove(arrow)
-        except ValueError:
-            log.warning(
-                f'Arrow was already removed?\n'
-                f'uid: {uid!r}\n'
-                f'{arrow!r}\n'
-            )
-
-    def remove_all(self) -> set[pg.ArrowItem]:
-        '''
-        Remove all arrows added by this editor from all
-        chart-views.
-
-        '''
-        for uid, arrows in self._arrows.items():
-            for arrow in arrows:
-                self.remove(arrow)
 
 
 class LineEditor(Struct):
@@ -341,9 +261,6 @@ class LineEditor(Struct):
 
         return lines
 
-    # compat with ArrowEditor
-    remove = remove_line
-
 
 def as_point(
     pair: Sequence[float, float] | QPointF,
@@ -376,7 +293,7 @@ class SelectRect(QtWidgets.QGraphicsRectItem):
     def __init__(
         self,
         viewbox: ViewBox,
-        color: str|None = None,
+        color: str | None = None,
     ) -> None:
         super().__init__(0, 0, 1, 1)
 
@@ -692,6 +609,3 @@ class SelectRect(QtWidgets.QGraphicsRectItem):
 
         ):
             scen.removeItem(self._label_proxy)
-
-    # compat with ArrowEditor
-    remove = delete

piker/ui/_exec.py

@@ -56,7 +56,7 @@ from . import _style
 
 
 if TYPE_CHECKING:
-    from ._widget import GodWidget
+    from ._chart import GodWidget
 
 
 log = get_logger(__name__)
@@ -91,10 +91,6 @@ def run_qtractor(
     window_type: QMainWindow = None,
 
 ) -> None:
-    '''
-    Run the Qt event loop and embed `trio` via guest mode on it.
-
-    '''
     # avoids annoying message when entering debugger from qt loop
     pyqtRemoveInputHook()
 
@@ -174,7 +170,7 @@ def run_qtractor(
     # hook into app focus change events
     app.focusChanged.connect(window.on_focus_change)
 
-    instance: GodWidget = main_widget_type()
+    instance = main_widget_type()
     instance.window = window
 
     # override tractor's defaults

piker/ui/_fsp.py

@@ -73,7 +73,7 @@ log = get_logger(__name__)
 def update_fsp_chart(
     viz,
     graphics_name: str,
-    array_key: str|None,
+    array_key: str | None,
     **kwargs,
 
 ) -> None:
@@ -87,11 +87,7 @@ def update_fsp_chart(
 
     # guard against unreadable case
     if not last_row:
-        log.warning(
+        log.warning(f'Read-race on shm array: {graphics_name}@{shm.token}')
-            f'Read-race on shm array,\n'
-            f'graphics_name: {graphics_name!r}\n'
-            f'shm.token: {shm.token}\n'
-        )
         return
 
     # update graphics
@@ -183,17 +179,13 @@ async def open_fsp_sidepane(
 
 @acm
 async def open_fsp_actor_cluster(
-    names: list[str] = [
+    names: list[str] = ['fsp_0', 'fsp_1'],
-        'fsp_0',
-        'fsp_1',
-    ],
 
 ) -> AsyncGenerator[
     int,
     dict[str, tractor.Portal]
 ]:
 
-    # TODO! change to .experimental!
     from tractor._clustering import open_actor_cluster
 
     # profiler = Profiler(
@@ -201,7 +193,7 @@ async def open_fsp_actor_cluster(
     #     disabled=False
     # )
     async with open_actor_cluster(
-        count=len(names),
+        count=2,
         names=names,
         modules=['piker.fsp._engine'],
 
@@ -211,6 +203,7 @@ async def open_fsp_actor_cluster(
 
 
 async def run_fsp_ui(
+
     linkedsplits: LinkedSplits,
     flume: Flume,
     started: trio.Event,
@@ -478,7 +471,7 @@ class FspAdmin:
         target: Fsp,
         conf: dict[str, dict[str, Any]],
 
-        worker_name: str|None = None,
+        worker_name: str | None = None,
         loglevel: str = 'info',
 
     ) -> (Flume, trio.Event):
@@ -501,8 +494,7 @@ class FspAdmin:
 
         portal: tractor.Portal = (
             self.cluster.get(worker_name)
-            or
+            or self.rr_next_portal()
-            self.rr_next_portal()
         )
 
         # TODO: this should probably be turned into a
@@ -631,10 +623,8 @@ async def open_fsp_admin(
                 event.set()
 
 
-# TODO, passing in `pikerd` related settings here!
-# [ ] read in the `tractor` setting for `enable_transports: list`
-#    from the root `conf.toml`!
 async def open_vlm_displays(
+
     linked: LinkedSplits,
     flume: Flume,
     dvlm: bool = True,
@@ -644,12 +634,12 @@ async def open_vlm_displays(
 
 ) -> None:
     '''
-    Vlm (volume) subchart displays.
+    Volume subchart displays.
 
     Since "volume" is often included directly alongside OHLCV price
-    data, we don't really need a separate FSP-actor + shm array for
+    data, we don't really need a separate FSP-actor + shm array for it
-    it since it's likely already directly adjacent to OHLC samples
+    since it's likely already directly adjacent to OHLC samples from the
-    from the data provider.
+    data provider.
 
     Further only if volume data is detected (it sometimes isn't provided
     eg. forex, certain commodities markets) will volume dependent FSPs

piker/ui/_interaction.py

@@ -43,7 +43,6 @@ from pyqtgraph import (
     functions as fn,
 )
 import numpy as np
-import tractor
 import trio
 
 from piker.ui.qt import (
@@ -73,10 +72,7 @@ if TYPE_CHECKING:
         GodWidget,
     )
     from ._dataviz import Viz
-    from .order_mode import (
+    from .order_mode import OrderMode
-        OrderMode,
-        Dialog,
-    )
     from ._display import DisplayState
 
 
@@ -134,12 +130,7 @@ async def handle_viewmode_kb_inputs(
 
     async for kbmsg in recv_chan:
         event, etype, key, mods, text = kbmsg.to_tuple()
-        log.debug(
+        log.debug(f'key: {key}, mods: {mods}, text: {text}')
-            f'View-mode kb-msg received,\n'
-            f'mods: {mods!r}\n'
-            f'key: {key!r}\n'
-            f'text: {text!r}\n'
-        )
         now = time.time()
         period = now - last
 
@@ -167,12 +158,8 @@ async def handle_viewmode_kb_inputs(
             # have no previous keys or we do and the min_tap period is
             # met
             if (
-                not fast_key_seq
+                not fast_key_seq or
-                or (
+                period <= min_tap and fast_key_seq
-                    period <= min_tap
-                    and
-                    fast_key_seq
-                )
             ):
                 fast_key_seq.append(text)
                 log.debug(f'fast keys seqs {fast_key_seq}')
@@ -187,8 +174,7 @@ async def handle_viewmode_kb_inputs(
             # UI REPL-shell, with ctrl-p (for "pause")
             if (
                 ctrl
-                and
+                and key in {
-                key in {
                     Qt.Key_P,
                 }
             ):
@@ -198,6 +184,7 @@ async def handle_viewmode_kb_inputs(
                 vlm_chart = chart.linked.subplots['volume']  # noqa
                 vlm_viz = vlm_chart.main_viz  # noqa
                 dvlm_pi = vlm_chart._vizs['dolla_vlm'].plot  # noqa
+                import tractor
                 await tractor.pause()
                 view.interact_graphics_cycle()
 
@@ -205,8 +192,7 @@ async def handle_viewmode_kb_inputs(
             # shown data `Viz`s for the current chart app.
             if (
                 ctrl
-                and
+                and key in {
-                key in {
                     Qt.Key_R,
                 }
             ):
@@ -245,8 +231,7 @@ async def handle_viewmode_kb_inputs(
                 key == Qt.Key_Escape
                 or (
                     ctrl
-                    and
+                    and key == Qt.Key_C
-                    key == Qt.Key_C
                 )
             ):
                 # ctrl-c as cancel
@@ -257,35 +242,17 @@ async def handle_viewmode_kb_inputs(
             # cancel order or clear graphics
             if (
                 key == Qt.Key_C
-                or
+                or key == Qt.Key_Delete
-                key == Qt.Key_Delete
             ):
-                # log.info('Handling <c> hotkey!')
-                try:
-                    dialogs: list[Dialog] = order_mode.cancel_orders_under_cursor()
-                except BaseException:
-                    log.exception('Failed to cancel orders !?\n')
-                    await tractor.pause()
 
-                if not dialogs:
+                order_mode.cancel_orders_under_cursor()
-                    log.warning(
-                        'No orders were cancelled?\n'
-                        'Is there an order-line under the cursor?\n'
-                        'If you think there IS your DE might be "hiding the mouse" before '
-                        'we rx the keyboard input via Qt..\n'
-                        '=> Check your DE and/or TWM settings to be sure! <=\n'
-                    )
-                    # ^TODO?, some way to detect if there's lines and
-                    # the DE is cuckin with things?
-                    # await tractor.pause()
 
             # View modes
             if (
                 ctrl
                 and (
                     key == Qt.Key_Equal
-                    or
+                    or key == Qt.Key_I
-                    key == Qt.Key_I
                 )
             ):
                 view.wheelEvent(
@@ -297,8 +264,7 @@ async def handle_viewmode_kb_inputs(
                 ctrl
                 and (
                     key == Qt.Key_Minus
-                    or
+                    or key == Qt.Key_O
-                    key == Qt.Key_O
                 )
             ):
                 view.wheelEvent(
@@ -309,8 +275,7 @@ async def handle_viewmode_kb_inputs(
 
             elif (
                 not ctrl
-                and
+                and key == Qt.Key_R
-                key == Qt.Key_R
             ):
                 # NOTE: seems that if we don't yield a Qt render
                 # cycle then the m4 downsampled curves will show here
@@ -512,8 +477,7 @@ async def handle_viewmode_mouse(
         #     view.raiseContextMenu(event)
 
         if (
-            view.order_mode.active
+            view.order_mode.active and
-            and
             button == QtCore.Qt.LeftButton
         ):
             # when in order mode, submit execution
@@ -817,8 +781,7 @@ class ChartView(ViewBox):
 
         # Scale or translate based on mouse button
         if btn & (
-            QtCore.Qt.LeftButton
+            QtCore.Qt.LeftButton | QtCore.Qt.MidButton
-            | QtCore.Qt.MidButton
         ):
             # zoom y-axis ONLY when click-n-drag on it
             # if axis == 1:

piker/ui/_l1.py

@@ -237,8 +237,8 @@ class LevelLabel(YAxisLabel):
 class L1Label(LevelLabel):
 
     text_flags = (
-        QtCore.Qt.TextFlag.TextDontClip
+        QtCore.Qt.TextDontClip
-        | QtCore.Qt.AlignmentFlag.AlignLeft
+        | QtCore.Qt.AlignLeft
     )
 
     def set_label_str(

piker/ui/_lines.py

@@ -52,13 +52,10 @@ from ._anchors import (
 from ..calc import humanize
 from ._label import Label
 from ._style import hcolor, _font
-from ..log import get_logger
 
 if TYPE_CHECKING:
     from ._cursor import Cursor
 
-log = get_logger(__name__)
-
 
 # TODO: probably worth investigating if we can
 # make .boundingRect() faster:
@@ -350,7 +347,7 @@ class LevelLine(pg.InfiniteLine):
 
     ) -> None:
         # TODO: enter labels edit mode
-        log.debug(f'double click {ev}')
+        print(f'double click {ev}')
 
     def paint(
         self,
@@ -464,19 +461,10 @@ class LevelLine(pg.InfiniteLine):
         # hovered
         if (
             not ev.isExit()
-            and
+            and ev.acceptDrags(QtCore.Qt.LeftButton)
-            ev.acceptDrags(QtCore.Qt.LeftButton)
         ):
             # if already hovered we don't need to run again
-            if (
+            if self.mouseHovering is True:
-                self.mouseHovering is True
-                and
-                cur.is_hovered(self)
-            ):
-                log.debug(
-                    f'Already hovering ??\n'
-                    f'cur._hovered: {cur._hovered!r}\n'
-                )
                 return
 
             if self.only_show_markers_on_hover:
@@ -493,7 +481,6 @@ class LevelLine(pg.InfiniteLine):
                     cur._y_label_update = False
 
             # add us to cursor state
-            log.debug(f'Adding line {self!r}\n')
             cur.add_hovered(self)
 
             if self._hide_xhair_on_hover:
@@ -521,7 +508,6 @@ class LevelLine(pg.InfiniteLine):
 
             self.currentPen = self.pen
 
-            log.debug(f'Removing line {self!r}\n')
             cur._hovered.remove(self)
 
             if self.only_show_markers_on_hover:

piker/ui/_remote_ctl.py

@@ -15,8 +15,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 '''
-Remote control tasks for sending annotations (and maybe more cmds) to
+Remote control tasks for sending annotations (and maybe more cmds)
-a chart from some other actor.
+to a chart from some other actor.
 
 '''
 from __future__ import annotations
@@ -27,14 +27,11 @@ from contextlib import (
 from functools import partial
 from pprint import pformat
 from typing import (
+    # Any,
     AsyncContextManager,
-    Literal,
 )
-from uuid import uuid4
 
-import pyqtgraph as pg
 import tractor
-import trio
 from tractor import trionics
 from tractor import (
     Portal,
@@ -49,16 +46,12 @@ from piker.brokers import SymbolNotFound
 from piker.ui.qt import (
     QGraphicsItem,
 )
-from PyQt6.QtGui import QFont
 from ._display import DisplayState
 from ._interaction import ChartView
-from ._editors import (
+from ._editors import SelectRect
-    SelectRect,
-    ArrowEditor,
-)
 from ._chart import ChartPlotWidget
 from ._dataviz import Viz
-from ._style import hcolor
+
 
 log = get_logger(__name__)
 
@@ -89,40 +82,8 @@ _ctxs: IpcCtxTable = {}
 # the "annotations server" which actually renders to a Qt canvas).
 # type AnnotsTable = dict[int, QGraphicsItem]
 AnnotsTable = dict[int, QGraphicsItem]
-EditorsTable = dict[int, ArrowEditor]
 
 _annots: AnnotsTable  = {}
-_editors: EditorsTable = {}
-
-def rm_annot(
-    annot: ArrowEditor|SelectRect|pg.TextItem
-) -> bool:
-    global _editors
-    match annot:
-        case pg.ArrowItem():
-            editor = _editors[annot._uid]
-            editor.remove(annot)
-            # ^TODO? only remove each arrow or all?
-            # if editor._arrows:
-            #     editor.remove_all()
-            # else:
-            #     log.warning(
-            #         f'Annot already removed!\n'
-            #         f'{annot!r}\n'
-            #     )
-            return True
-
-        case SelectRect():
-            annot.delete()
-            return True
-
-        case pg.TextItem():
-            scene = annot.scene()
-            if scene:
-                scene.removeItem(annot)
-            return True
-
-    return False
 
 
 async def serve_rc_annots(
@@ -133,12 +94,6 @@ async def serve_rc_annots(
     annots: AnnotsTable,
 
 ) -> None:
-    '''
-    A small viz(ualization) server for remote ctl of chart
-    annotations.
-
-    '''
-    global _editors
     async for msg in annot_req_stream:
         match msg:
             case {
@@ -148,77 +103,14 @@ async def serve_rc_annots(
                 'meth': str(meth),
                 'kwargs': dict(kwargs),
             }:
+
                 ds: DisplayState = _dss[fqme]
-                try:
+                chart: ChartPlotWidget = {
-                    chart: ChartPlotWidget = {
+                    60: ds.hist_chart,
-                        60: ds.hist_chart,
+                    1: ds.chart,
-                        1: ds.chart,
+                }[timeframe]
-                    }[timeframe]
-                except KeyError:
-                    msg: str = (
-                        f'No chart for timeframe={timeframe}s, '
-                        f'skipping rect annotation'
-                    )
-                    log.exeception(msg)
-                    await annot_req_stream.send({'error': msg})
-                    continue
-
                 cv: ChartView = chart.cv
 
-                # NEW: if timestamps provided, lookup current indices
-                # from shm to ensure alignment with current buffer
-                # state
-                start_time = kwargs.pop('start_time', None)
-                end_time = kwargs.pop('end_time', None)
-                if (
-                    start_time is not None
-                    and end_time is not None
-                ):
-                    viz: Viz = chart.get_viz(fqme)
-                    shm = viz.shm
-                    arr = shm.array
-
-                    # lookup start index
-                    start_matches = arr[arr['time'] == start_time]
-                    if len(start_matches) == 0:
-                        msg: str = (
-                            f'No shm entry for start_time={start_time}, '
-                            f'skipping rect'
-                        )
-                        log.error(msg)
-                        await annot_req_stream.send({'error': msg})
-                        continue
-
-                    # lookup end index
-                    end_matches = arr[arr['time'] == end_time]
-                    if len(end_matches) == 0:
-                        msg: str = (
-                            f'No shm entry for end_time={end_time}, '
-                            f'skipping rect'
-                        )
-                        log.error(msg)
-                        await annot_req_stream.send({'error': msg})
-                        continue
-
-                    # get close price from start bar, open from end
-                    # bar
-                    start_idx = float(start_matches[0]['index'])
-                    end_idx = float(end_matches[0]['index'])
-                    start_close = float(start_matches[0]['close'])
-                    end_open = float(end_matches[0]['open'])
-
-                    # reconstruct start_pos and end_pos with
-                    # looked-up indices
-                    from_idx: float = 0.16 - 0.06  # BGM offset
-                    kwargs['start_pos'] = (
-                        start_idx + 1 - from_idx,
-                        start_close,
-                    )
-                    kwargs['end_pos'] = (
-                        end_idx + from_idx,
-                        end_open,
-                    )
-
                 # annot type lookup from cmd
                 rect = SelectRect(
                     viewbox=cv,
@@ -237,207 +129,21 @@ async def serve_rc_annots(
                 # delegate generically to the requested method
                 getattr(rect, meth)(**kwargs)
                 rect.show()
-
-                # XXX: store absolute coords for repositioning
-                # during viz redraws (eg backfill updates)
-                rect._meth = meth
-                rect._kwargs = kwargs
-
                 aid: int = id(rect)
                 annots[aid] = rect
                 aids: set[int] = ctxs[ipc_key][1]
                 aids.add(aid)
                 await annot_req_stream.send(aid)
 
-            case {
-                'cmd': 'ArrowEditor',
-                'fqme': fqme,
-                'timeframe': timeframe,
-                'meth': 'add'|'remove' as meth,
-                'kwargs': {
-                    'x': float(x),
-                    'y': float(y),
-                    'pointing': pointing,
-                    'color': color,
-                    'aid': str()|None as aid,
-                    'alpha': int(alpha),
-                    'headLen': int()|float()|None as headLen,
-                    'headWidth': int()|float()|None as headWidth,
-                    'tailLen': int()|float()|None as tailLen,
-                    'tailWidth': int()|float()|None as tailWidth,
-                    'pxMode': bool(pxMode),
-                    'time': int()|float()|None as timestamp,
-                },
-                # ?TODO? split based on method fn-sigs?
-                # 'pointing',
-            }:
-                ds: DisplayState = _dss[fqme]
-                try:
-                    chart: ChartPlotWidget = {
-                        60: ds.hist_chart,
-                        1: ds.chart,
-                    }[timeframe]
-                except KeyError:
-                    log.warning(
-                        f'No chart for timeframe={timeframe}s, '
-                        f'skipping arrow annotation'
-                    )
-                    # return -1 to indicate failure
-                    await annot_req_stream.send(-1)
-                    continue
-                cv: ChartView = chart.cv
-                godw = chart.linked.godwidget
-
-                # NEW: if timestamp provided, lookup current index
-                # from shm to ensure alignment with current buffer
-                # state
-                if timestamp is not None:
-                    viz: Viz = chart.get_viz(fqme)
-                    shm = viz.shm
-                    arr = shm.array
-                    # find index where time matches timestamp
-                    matches = arr[arr['time'] == timestamp]
-                    if len(matches) == 0:
-                        log.error(
-                            f'No shm entry for timestamp={timestamp}, '
-                            f'skipping arrow annotation'
-                        )
-                        await annot_req_stream.send(-1)
-                        continue
-                    # use the matched row's index as x
-                    x = float(matches[0]['index'])
-
-                arrows = ArrowEditor(godw=godw)
-                # `.add/.remove()` API
-                if meth != 'add':
-                    # await tractor.pause()
-                    raise ValueError(
-                        f'Invalid arrow-edit request ?\n'
-                        f'{msg!r}\n'
-                    )
-
-                aid: str = str(uuid4())
-                arrow: pg.ArrowItem = arrows.add(
-                    plot=chart.plotItem,
-                    uid=aid,
-                    x=x,
-                    y=y,
-                    pointing=pointing,
-                    color=color,
-                    alpha=alpha,
-                    headLen=headLen,
-                    headWidth=headWidth,
-                    tailLen=tailLen,
-                    tailWidth=tailWidth,
-                    pxMode=pxMode,
-                )
-                # XXX: store absolute coords for repositioning
-                # during viz redraws (eg backfill updates)
-                arrow._abs_x = x
-                arrow._abs_y = y
-
-                annots[aid] = arrow
-                _editors[aid] = arrows
-                aids: set[int] = ctxs[ipc_key][1]
-                aids.add(aid)
-                await annot_req_stream.send(aid)
-
-            case {
-                'cmd': 'TextItem',
-                'fqme': fqme,
-                'timeframe': timeframe,
-                'kwargs': {
-                    'text': str(text),
-                    'x': int()|float() as x,
-                    'y': int()|float() as y,
-                    'color': color,
-                    'anchor': list(anchor),
-                    'font_size': int()|None as font_size,
-                    'time': int()|float()|None as timestamp,
-                },
-            }:
-                ds: DisplayState = _dss[fqme]
-                try:
-                    chart: ChartPlotWidget = {
-                        60: ds.hist_chart,
-                        1: ds.chart,
-                    }[timeframe]
-                except KeyError:
-                    log.warning(
-                        f'No chart for timeframe={timeframe}s, '
-                        f'skipping text annotation'
-                    )
-                    await annot_req_stream.send(-1)
-                    continue
-
-                # NEW: if timestamp provided, lookup current index
-                # from shm to ensure alignment with current buffer
-                # state
-                if timestamp is not None:
-                    viz: Viz = chart.get_viz(fqme)
-                    shm = viz.shm
-                    arr = shm.array
-                    # find index where time matches timestamp
-                    matches = arr[arr['time'] == timestamp]
-                    if len(matches) == 0:
-                        log.error(
-                            f'No shm entry for timestamp={timestamp}, '
-                            f'skipping text annotation'
-                        )
-                        await annot_req_stream.send(-1)
-                        continue
-                    # use the matched row's index as x, +1 for text
-                    # offset
-                    x = float(matches[0]['index']) + 1
-
-                # convert named color to hex
-                color_hex: str = hcolor(color)
-
-                # create text item
-                text_item: pg.TextItem = pg.TextItem(
-                    text=text,
-                    color=color_hex,
-                    anchor=anchor,
-
-                    # ?TODO, pin to github:main for this?
-                    # legacy, can have scaling ish?
-                    # ensureInBounds=True,
-                )
-
-                # apply font size (default to DpiAwareFont if not
-                # provided)
-                if font_size is None:
-                    from ._style import get_fonts
-                    font, font_small = get_fonts()
-                    font_size =  font_small.px_size - 1
-
-                qfont: QFont = text_item.textItem.font()
-                qfont.setPixelSize(font_size)
-                text_item.setFont(qfont)
-
-                text_item.setPos(x, y)
-                chart.plotItem.addItem(text_item)
-
-                # XXX: store absolute coords for repositioning
-                # during viz redraws (eg backfill updates)
-                text_item._abs_x = x
-                text_item._abs_y = y
-
-                aid: str = str(uuid4())
-                annots[aid] = text_item
-                aids: set[int] = ctxs[ipc_key][1]
-                aids.add(aid)
-                await annot_req_stream.send(aid)
-
             case {
                 'cmd': 'remove',
-                'aid': int(aid)|str(aid),
+                'aid': int(aid),
             }:
                 # NOTE: this is normally entered on
                 # a client's annotation de-alloc normally
                 # prior to detach or modify.
                 annot: QGraphicsItem = annots[aid]
-                assert rm_annot(annot)
+                annot.delete()
 
                 # respond to client indicating annot
                 # was indeed deleted.
@@ -468,38 +174,6 @@ async def serve_rc_annots(
                 )
                 viz.reset_graphics()
 
-                # XXX: reposition all annotations to ensure they
-                # stay aligned with viz data after reset (eg during
-                # backfill when abs-index range changes)
-                n_repositioned: int = 0
-                for aid, annot in annots.items():
-                    # arrows and text items use abs x,y coords
-                    if (
-                        hasattr(annot, '_abs_x')
-                        and
-                        hasattr(annot, '_abs_y')
-                    ):
-                        annot.setPos(
-                            annot._abs_x,
-                            annot._abs_y,
-                        )
-                        n_repositioned += 1
-
-                    # rects use method + kwargs
-                    elif (
-                        hasattr(annot, '_meth')
-                        and
-                        hasattr(annot, '_kwargs')
-                    ):
-                        getattr(annot, annot._meth)(**annot._kwargs)
-                        n_repositioned += 1
-
-                if n_repositioned:
-                    log.info(
-                        f'Repositioned {n_repositioned} annotation(s) '
-                        f'after viz redraw'
-                    )
-
             case _:
                 log.error(
                     'Unknown remote annotation cmd:\n'
@@ -513,12 +187,6 @@ async def remote_annotate(
 ) -> None:
 
     global _dss, _ctxs
-    if not _dss:
-        raise RuntimeError(
-            'Race condition on chart-init state ??\n'
-            'Anoter actor is trying to annoate this chart '
-            'before it has fully spawned.\n'
-        )
     assert _dss
 
     _ctxs[ctx.cid] = (ctx, set())
@@ -543,7 +211,7 @@ async def remote_annotate(
             assert _ctx is ctx
             for aid in aids:
                 annot: QGraphicsItem = _annots[aid]
-                assert rm_annot(annot)
+                annot.delete()
 
 
 class AnnotCtl(Struct):
@@ -588,47 +256,36 @@ class AnnotCtl(Struct):
 
         from_acm: bool = False,
 
-        # NEW: optional timestamps for server-side index lookup
+    ) -> int:
-        start_time: float|None = None,
-        end_time: float|None = None,
-
-    ) -> int|None:
         '''
         Add a `SelectRect` annotation to the target view, return
         the instances `id(obj)` from the remote UI actor.
 
         '''
         ipc: MsgStream = self._get_ipc(fqme)
-        with trio.fail_after(3):
+        await ipc.send({
-            await ipc.send({
+            'fqme': fqme,
-                'fqme': fqme,
+            'cmd': 'SelectRect',
-                'cmd': 'SelectRect',
+            'timeframe': timeframe,
-                'timeframe': timeframe,
+            # 'meth': str(meth),
-                # 'meth': str(meth),
+            'meth': 'set_view_pos' if domain == 'view' else 'set_scene_pos',
-                'meth': 'set_view_pos' if domain == 'view' else 'set_scene_pos',
+            'kwargs': {
-                'kwargs': {
+                'start_pos': tuple(start_pos),
-                    'start_pos': tuple(start_pos),
+                'end_pos': tuple(end_pos),
-                    'end_pos': tuple(end_pos),
+                'color': color,
-                    'color': color,
+                'update_label': False,
-                    'update_label': False,
+            },
-                    'start_time': start_time,
+        })
-                    'end_time': end_time,
+        aid: int = await ipc.receive()
-                },
+        self._ipcs[aid] = ipc
-            })
+        if not from_acm:
-            aid: int|dict = await ipc.receive()
+            self._annot_stack.push_async_callback(
-            match aid:
+                partial(
-                case {'error': str(msg)}:
+                    self.remove,
-                    log.error(msg)
+                    aid,
-                    return None
-            self._ipcs[aid] = ipc
-            if not from_acm:
-                self._annot_stack.push_async_callback(
-                    partial(
-                        self.remove,
-                        aid,
-                    )
                 )
-            return aid
+            )
+        return aid
 
     async def remove(
         self,
@@ -659,9 +316,7 @@ class AnnotCtl(Struct):
             )
             yield aid
         finally:
-            # async ipc send op
+            await self.remove(aid)
-            with trio.CancelScope(shield=True):
-                await self.remove(aid)
 
     async def redraw(
         self,
@@ -676,130 +331,20 @@ class AnnotCtl(Struct):
             'timeframe': timeframe,
         })
 
-    async def add_arrow(
+    # TODO: do we even need this?
-        self,
+    # async def modify(
-        fqme: str,
+    #     self,
-        timeframe: float,
+    #     aid: int,  # annotation id
-        x: float,
+    #     meth: str,  # far end graphics object method to invoke
-        y: float,
+    #     params: dict[str, Any],  # far end `meth(**kwargs)`
-        pointing: Literal[
+    # ) -> bool:
-            'up',
+    #     '''
-            'down',
+    #     Modify an existing (remote) annotation's graphics
-        ],
+    #     paramters, thus changing it's appearance / state in real
-        # TODO: a `Literal['view', 'scene']` for this?
+    #     time.
-        # domain: str = 'view',  # or 'scene'
-        color: str = 'dad_blue',
-        alpha: int = 116,
-        headLen: float|None = None,
-        headWidth: float|None = None,
-        tailLen: float|None = None,
-        tailWidth: float|None = None,
-        pxMode: bool = True,
 
-        from_acm: bool = False,
+    #     '''
-
+    #     raise NotImplementedError
-        # NEW: optional timestamp for server-side index lookup
-        time: float|None = None,
-
-    ) -> int|None:
-        '''
-        Add a `SelectRect` annotation to the target view, return
-        the instances `id(obj)` from the remote UI actor.
-
-        '''
-        ipc: MsgStream = self._get_ipc(fqme)
-        with trio.fail_after(3):
-            await ipc.send({
-                'fqme': fqme,
-                'cmd': 'ArrowEditor',
-                'timeframe': timeframe,
-                # 'meth': str(meth),
-                'meth': 'add',
-                'kwargs': {
-                    'x': float(x),
-                    'y': float(y),
-                    'color': color,
-                    'pointing': pointing,  # up|down
-                    'alpha': alpha,
-                    'aid': None,
-                    'headLen': headLen,
-                    'headWidth': headWidth,
-                    'tailLen': tailLen,
-                    'tailWidth': tailWidth,
-                    'pxMode': pxMode,
-                    'time': time,  # for server-side index lookup
-                },
-            })
-            aid: int|dict = await ipc.receive()
-            match aid:
-                case {'error': str(msg)}:
-                    log.error(msg)
-                    return None
-
-            self._ipcs[aid] = ipc
-            if not from_acm:
-                self._annot_stack.push_async_callback(
-                    partial(
-                        self.remove,
-                        aid,
-                    )
-                )
-            return aid
-
-    async def add_text(
-        self,
-        fqme: str,
-        timeframe: float,
-        text: str,
-        x: float,
-        y: float,
-        color: str|tuple = 'dad_blue',
-        anchor: tuple[float, float] = (0, 1),
-        font_size: int|None = None,
-
-        from_acm: bool = False,
-
-        # NEW: optional timestamp for server-side index lookup
-        time: float|None = None,
-
-    ) -> int|None:
-        '''
-        Add a `pg.TextItem` annotation to the target view.
-
-        anchor: (x, y) where (0,0) is upper-left, (1,1) is lower-right
-        font_size: pixel size for font, defaults to `_font.font.pixelSize()`
-
-        '''
-        ipc: MsgStream = self._get_ipc(fqme)
-        with trio.fail_after(3):
-            await ipc.send({
-                'fqme': fqme,
-                'cmd': 'TextItem',
-                'timeframe': timeframe,
-                'kwargs': {
-                    'text': text,
-                    'x': float(x),
-                    'y': float(y),
-                    'color': color,
-                    'anchor': tuple(anchor),
-                    'font_size': font_size,
-                    'time': time,  # for server-side index lookup
-                },
-            })
-            aid: int|dict = await ipc.receive()
-            match aid:
-                case {'error': str(msg)}:
-                    log.error(msg)
-                    return None
-            self._ipcs[aid] = ipc
-            if not from_acm:
-                self._annot_stack.push_async_callback(
-                    partial(
-                        self.remove,
-                        aid,
-                    )
-                )
-            return aid
 
 
 @acm
@@ -826,9 +371,7 @@ async def open_annot_ctl(
         # TODO: print the current discoverable actor UID set
         # here as well?
         if not maybe_portals:
-            raise RuntimeError(
+            raise RuntimeError('No chart UI actors found in service domain?')
-                'No chart actors found in service domain?'
-            )
 
         for portal in maybe_portals:
             ctx_mngrs.append(

piker/ui/_style.py

@@ -61,7 +61,7 @@ class DpiAwareFont:
     ) -> None:
 
         self._font_size_calc_key: str = _font_size_key
-        self._font_size: int|None = None
+        self._font_size: int | None = None
 
         # Read preferred font size from main config file if it exists
         conf, path = config.load('conf', touch_if_dne=True)
@@ -107,22 +107,7 @@ class DpiAwareFont:
 
     @property
     def px_size(self) -> int:
-        size: int = self._qfont.pixelSize()
+        return self._qfont.pixelSize()
-
-        # XXX, when no Qt app has been spawned this will always be
-        # invalid..
-        # SO, just return any conf.toml value.
-        if size == -1:
-            if (conf_size := self._font_size) is None:
-                raise ValueError(
-                    f'No valid `{type(_font).__name__}.px_size` set?\n'
-                    f'\n'
-                    f'-> `ui.font_size` is NOT set in `conf.toml`\n'
-                    f'-> no Qt app is active ??\n'
-                )
-            return conf_size
-
-        return size
 
     def configure_to_dpi(self, screen: QtGui.QScreen | None = None):
         '''
@@ -236,20 +221,6 @@ def _config_fonts_to_screen() -> None:
     _font_small.configure_to_dpi()
 
 
-def get_fonts() -> tuple[
-    DpiAwareFont,
-    DpiAwareFont,
-]:
-    '''
-    Get the singleton font pair (of instances) from which all other
-    UI/UX should be "scaled around".
-
-    See `DpiAwareFont` for (internal) deats.
-
-    '''
-    return _font, _font_small
-
-
 # TODO: re-compute font size when main widget switches screens?
 # https://forum.qt.io/topic/54136/how-do-i-get-the-qscreen-my-widget-is-on-qapplication-desktop-screen-returns-a-qwidget-and-qobject_cast-qscreen-returns-null/3
 
@@ -337,7 +308,6 @@ def hcolor(name: str) -> str:
         'cool_green': '#33b864',
         'dull_green': '#74a662',
         'hedge_green': '#518360',
-        'lilypad_green': '#839c84',
 
         # orders and alerts
         'alert_yellow': '#e2d083',
@@ -365,7 +335,6 @@ def hcolor(name: str) -> str:
         'sell_red': '#b6003f',
         # 'sell_red': '#d00048',
         'sell_red_light': '#f85462',
-        'wine': '#69212d',
 
         # 'sell_red': '#f85462',
         # 'sell_red_light': '#ff4d5c',

piker/ui/_widget.py

@@ -1,352 +0,0 @@
-# piker: trading gear for hackers
-# Copyright (C) Tyler Goodlet (in stewardship for pikers)
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-'''
-Root-most (what they call a "central widget") of every Qt-UI-app's
-window.
-
-'''
-from __future__ import annotations
-from typing import (
-    Iterator,
-    TYPE_CHECKING,
-)
-
-import trio
-
-from piker.ui.qt import (
-    QtCore,
-    Qt,
-    QWidget,
-    QHBoxLayout,
-    QVBoxLayout,
-)
-from ..log import get_logger
-
-if TYPE_CHECKING:
-    from ._search import SearchWidget
-    from ._chart import (
-        LinkedSplits,
-    )
-    from ._cursor import (
-        Cursor,
-    )
-
-
-log = get_logger(__name__)
-
-_godw: GodWidget|None = None
-
-def get_godw() -> GodWidget:
-    '''
-    Get the top level "god widget", the root/central-most Qt
-    widget-object set as `QMainWindow.setCentralWidget(_godw)`.
-
-    See `piker.ui._exec` for the runtime init details and all the
-    machinery for running `trio` on the Qt event loop in guest mode.
-
-    '''
-    if _godw is None:
-        raise RuntimeError(
-            'No god-widget initialized ??\n'
-            'Have you called `run_qtractor()` yet?\n'
-        )
-    return _godw
-
-
-class GodWidget(QWidget):
-    '''
-    "Our lord and savior, the holy child of window-shua, there is no
-    widget above thee." - 6|6
-
-    The highest level composed widget which contains layouts for
-    organizing charts as well as other sub-widgets used to control or
-    modify them.
-
-    '''
-    search: SearchWidget
-    mode_name: str = 'god'
-
-    def __init__(
-
-        self,
-        parent=None,
-
-    ) -> None:
-
-        super().__init__(parent)
-
-        self.search: SearchWidget|None = None
-
-        self.hbox = QHBoxLayout(self)
-        self.hbox.setContentsMargins(0, 0, 0, 0)
-        self.hbox.setSpacing(6)
-        self.hbox.setAlignment(Qt.AlignTop)
-
-        self.vbox = QVBoxLayout()
-        self.vbox.setContentsMargins(0, 0, 0, 0)
-        self.vbox.setSpacing(2)
-        self.vbox.setAlignment(Qt.AlignTop)
-
-        self.hbox.addLayout(self.vbox)
-
-        self._chart_cache: dict[
-            str,
-            tuple[LinkedSplits, LinkedSplits],
-        ] = {}
-
-        self.hist_linked: LinkedSplits|None = None
-        self.rt_linked: LinkedSplits|None = None
-        self._active_cursor: Cursor|None = None
-
-        # assigned in the startup func `_async_main()`
-        self._root_n: trio.Nursery = None
-
-        self._widgets: dict[str, QWidget] = {}
-        self._resizing: bool = False
-
-        # TODO: do we need this, when would god get resized
-        # and the window does not? Never right?!
-        # self.reg_for_resize(self)
-
-    # TODO: strat loader/saver that we don't need yet.
-    # def init_strategy_ui(self):
-    #     self.toolbar_layout = QHBoxLayout()
-    #     self.toolbar_layout.setContentsMargins(0, 0, 0, 0)
-    #     self.vbox.addLayout(self.toolbar_layout)
-    #     self.strategy_box = StrategyBoxWidget(self)
-    #     self.toolbar_layout.addWidget(self.strategy_box)
-
-    @property
-    def linkedsplits(self) -> LinkedSplits:
-        return self.rt_linked
-
-    def set_chart_symbols(
-        self,
-        group_key: tuple[str],  # of form <fqme>.<providername>
-        all_linked: tuple[LinkedSplits, LinkedSplits],  # type: ignore
-
-    ) -> None:
-        # re-sort org cache symbol list in LIFO order
-        cache = self._chart_cache
-        cache.pop(group_key, None)
-        cache[group_key] = all_linked
-
-    def get_chart_symbols(
-        self,
-        symbol_key: str,
-
-    ) -> tuple[LinkedSplits, LinkedSplits]:  # type: ignore
-        return self._chart_cache.get(symbol_key)
-
-    async def load_symbols(
-        self,
-        fqmes: list[str],
-        loglevel: str,
-        reset: bool = False,
-
-    ) -> trio.Event:
-        '''
-        Load a new contract into the charting app.
-
-        Expects a ``numpy`` structured array containing all the ohlcv fields.
-
-        '''
-        # NOTE: for now we use the first symbol in the set as the "key"
-        # for the overlay of feeds on the chart.
-        group_key: tuple[str] = tuple(fqmes)
-
-        all_linked = self.get_chart_symbols(group_key)
-        order_mode_started = trio.Event()
-
-        if not self.vbox.isEmpty():
-
-            # XXX: seems to make switching slower?
-            # qframe = self.hist_linked.chart.qframe
-            # if qframe.sidepane is self.search:
-            #     qframe.hbox.removeWidget(self.search)
-
-            for linked in [self.rt_linked, self.hist_linked]:
-                # XXX: this is CRITICAL especially with pixel buffer caching
-                linked.hide()
-                linked.unfocus()
-
-                # XXX: pretty sure we don't need this
-                # remove any existing plots?
-                # XXX: ahh we might want to support cache unloading..
-                # self.vbox.removeWidget(linked)
-
-        # switching to a new viewable chart
-        if all_linked is None or reset:
-            from ._display import display_symbol_data
-
-            # we must load a fresh linked charts set
-            from ._chart import LinkedSplits
-            self.rt_linked = rt_charts = LinkedSplits(self)
-            self.hist_linked = hist_charts = LinkedSplits(self)
-
-            # spawn new task to start up and update new sub-chart instances
-            self._root_n.start_soon(
-                display_symbol_data,
-                self,
-                fqmes,
-                loglevel,
-                order_mode_started,
-            )
-
-            # self.vbox.addWidget(hist_charts)
-            self.vbox.addWidget(rt_charts)
-            self.set_chart_symbols(
-                group_key,
-                (hist_charts, rt_charts),
-            )
-
-            for linked in [hist_charts, rt_charts]:
-                linked.show()
-                linked.focus()
-
-            await trio.sleep(0)
-
-        else:
-            # symbol is already loaded and ems ready
-            order_mode_started.set()
-
-            self.hist_linked, self.rt_linked = all_linked
-
-            for linked in all_linked:
-                # TODO:
-                # - we'll probably want per-instrument/provider state here?
-                #   change the order config form over to the new chart
-
-                # chart is already in memory so just focus it
-                linked.show()
-                linked.focus()
-                linked.graphics_cycle()
-                await trio.sleep(0)
-
-                # resume feeds *after* rendering chart view asap
-                chart = linked.chart
-                if chart:
-                    chart.resume_all_feeds()
-
-            # TODO: we need a check to see if the chart
-            # last had the xlast in view, if so then shift so it's
-            # still in view, if the user was viewing history then
-            # do nothing yah?
-            self.rt_linked.chart.main_viz.default_view(
-                do_min_bars=True,
-            )
-
-        # if a history chart instance is already up then
-        # set the search widget as its sidepane.
-        hist_chart = self.hist_linked.chart
-        if hist_chart:
-            hist_chart.qframe.set_sidepane(self.search)
-
-            # NOTE: this is really stupid/hard to follow.
-            # we have to reposition the active position nav
-            # **AFTER** applying the search bar as a sidepane
-            # to the newly switched to symbol.
-            await trio.sleep(0)
-
-            # TODO: probably stick this in some kinda `LooknFeel` API?
-            for tracker in self.rt_linked.mode.trackers.values():
-                pp_nav = tracker.nav
-                if tracker.live_pp.cumsize:
-                    pp_nav.show()
-                    pp_nav.hide_info()
-                else:
-                    pp_nav.hide()
-
-        # set window titlebar info
-        symbol = self.rt_linked.mkt
-        if symbol is not None:
-            self.window.setWindowTitle(
-                f'{symbol.fqme} '
-                f'tick:{symbol.size_tick}'
-            )
-
-        return order_mode_started
-
-    def focus(self) -> None:
-        '''
-        Focus the top level widget which in turn focusses the chart
-        ala "view mode".
-
-        '''
-        # go back to view-mode focus (aka chart focus)
-        self.clearFocus()
-        chart = self.rt_linked.chart
-        if chart:
-            chart.setFocus()
-
-    def reg_for_resize(
-        self,
-        widget: QWidget,
-    ) -> None:
-        getattr(widget, 'on_resize')
-        self._widgets[widget.mode_name] = widget
-
-    def on_win_resize(
-        self,
-        event: QtCore.QEvent,
-    ) -> None:
-        '''
-        Top level god widget handler from window (the real yaweh) resize
-        events such that any registered widgets which wish to be
-        notified are invoked using our pythonic `.on_resize()` method
-        api.
-
-        Where we do UX magic to make things not suck B)
-
-        '''
-        if self._resizing:
-            return
-
-        self._resizing = True
-
-        log.debug(
-            f'God widget resize\n'
-            f'{event}\n'
-        )
-        for name, widget in self._widgets.items():
-            widget.on_resize()
-
-        self._resizing = False
-
-    # on_resize = on_win_resize
-
-    def get_cursor(self) -> Cursor:
-        return self._active_cursor
-
-    def iter_linked(self) -> Iterator[LinkedSplits]:
-        for linked in [self.hist_linked, self.rt_linked]:
-            yield linked
-
-    def resize_all(self) -> None:
-        '''
-        Dynamic resize sequence: adjusts all sub-widgets/charts to
-        sensible default ratios of what space is detected as available
-        on the display / window.
-
-        '''
-        rt_linked = self.rt_linked
-        rt_linked.set_split_sizes()
-        self.rt_linked.resize_sidepanes()
-        self.hist_linked.resize_sidepanes(from_linked=rt_linked)
-        self.search.on_resize()
-
-

piker/ui/_window.py

@@ -40,7 +40,7 @@ from piker.ui.qt import (
 )
 from ..log import get_logger
 from ._style import _font_small, hcolor
-from ._widget import GodWidget
+from ._chart import GodWidget
 
 
 log = get_logger(__name__)
@@ -61,9 +61,9 @@ class MultiStatus:
 
         self,
         msg: str,
-        final_msg: str|None = None,
+        final_msg: str | None = None,
         clear_on_next: bool = False,
-        group_key: Union[bool, str]|None = False,
+        group_key: Union[bool, str] | None = False,
 
     ) -> Union[Callable[..., None], str]:
         '''
@@ -175,11 +175,11 @@ class MainWindow(QMainWindow):
         self.setWindowTitle(self.title)
 
         # set by runtime after `trio` is engaged.
-        self.godwidget: GodWidget|None = None
+        self.godwidget: GodWidget | None = None
 
         self._status_bar: QStatusBar = None
         self._status_label: QLabel = None
-        self._size: tuple[int, int]|None = None
+        self._size: tuple[int, int] | None = None
 
     @property
     def mode_label(self) -> QLabel:
@@ -202,7 +202,7 @@ class MainWindow(QMainWindow):
             label.setMargin(2)
             label.setAlignment(
                 QtCore.Qt.AlignVCenter
-                |QtCore.Qt.AlignRight
+                | QtCore.Qt.AlignRight
             )
             self.statusBar().addPermanentWidget(label)
             label.show()
@@ -255,16 +255,8 @@ class MainWindow(QMainWindow):
         current: QWidget,
 
     ) -> None:
-        '''
-        Focus handler.
 
-        For now updates the "current mode" name.
+        log.info(f'widget focus changed from {last} -> {current}')
-
-        '''
-        log.debug(
-            f'widget focus changed from,\n'
-            f'{last} -> {current}'
-        )
 
         if current is not None:
             # cursor left window?
@@ -296,7 +288,7 @@ class MainWindow(QMainWindow):
 
     def configure_to_desktop(
         self,
-        size: tuple[int, int]|None = None,
+        size: tuple[int, int] | None = None,
 
     ) -> None:
         '''

piker/ui/cli.py

@@ -177,7 +177,7 @@ def chart(
             return
 
     # global opts
-    # brokernames: list[str] = config['brokers']
+    brokernames = config['brokers']
     brokermods = config['brokermods']
     assert brokermods
     tractorloglevel = config['tractorloglevel']
@@ -216,7 +216,6 @@ def chart(
                 layers['tcp']['port'],
             ))
 
-    # breakpoint()
     from tractor.devx import maybe_open_crash_handler
     pdb: bool = config['pdb']
     with maybe_open_crash_handler(pdb=pdb):

piker/ui/order_mode.py

@@ -59,14 +59,8 @@ from piker.data import (
 from piker.types import Struct
 from piker.log import get_logger
 from piker.ui.qt import Qt
-from ._editors import (
+from ._editors import LineEditor, ArrowEditor
-    LineEditor,
+from ._lines import order_line, LevelLine
-    ArrowEditor,
-)
-from ._lines import (
-    order_line,
-    LevelLine,
-)
 from ._position import (
     PositionTracker,
     SettingsPane,
@@ -77,6 +71,7 @@ from ._style import _font
 from ._forms import open_form_input_handling
 from ._notify import notify_from_ems_status_msg
 
+
 if TYPE_CHECKING:
     from ._chart import (
         ChartPlotWidget,
@@ -435,7 +430,7 @@ class OrderMode:
             lines=lines,
             last_status_close=self.multistatus.open_status(
                 f'submitting {order.exec_mode}-{order.action}',
-                # final_msg=f'submitted {order.exec_mode}-{order.action}',
+                final_msg=f'submitted {order.exec_mode}-{order.action}',
                 clear_on_next=True,
             )
         )
@@ -513,14 +508,13 @@ class OrderMode:
     def on_submit(
         self,
         uuid: str,
-        order: Order|None = None,
+        order: Order | None = None,
 
-    ) -> Dialog|None:
+    ) -> Dialog | None:
         '''
         Order submitted status event handler.
 
-        Commit the order line and registered order uuid, store ack
+        Commit the order line and registered order uuid, store ack time stamp.
-        time stamp.
 
         '''
         lines = self.lines.commit_line(uuid)
@@ -528,7 +522,7 @@ class OrderMode:
         # a submission is the start of a new order dialog
         dialog = self.dialogs[uuid]
         dialog.lines = lines
-        cls: Callable|None = dialog.last_status_close
+        cls: Callable | None = dialog.last_status_close
         if cls:
             cls()
 
@@ -561,13 +555,14 @@ class OrderMode:
 
     def on_fill(
         self,
+
         uuid: str,
         price: float,
         time_s: float,
 
         pointing: str | None = None,
 
-    ) -> bool:
+    ) -> None:
         '''
         Fill msg handler.
 
@@ -580,85 +575,62 @@ class OrderMode:
         - update fill bar size
 
         '''
-        # XXX WARNING XXX
+        dialog = self.dialogs[uuid]
-        # if a `Status(resp='error')` arrives *before* this
-        # fill-status, the `.dialogs` entry may have already been
-        # popped and thus the below will skipped.
-        #
-        # NOTE, to avoid this confusing scenario ensure that any
-        # errors delivered thru from the broker-backend are not just
-        # "noisy reporting" (like is very common from IB..) and are
-        # instead ONLY errors-causing-order-dialog-cancellation!
-        if not (dialog := self.dialogs.get(uuid)):
-            log.warning(
-                f'Order was already cleared from `.dialogs` ??\n'
-                f'uuid: {uuid!r}\n'
-            )
-            return False
-
         lines = dialog.lines
         chart = self.chart
 
-        if not lines:
+        # XXX: seems to fail on certain types of races?
-            log.warn("No line(s) for order {uuid}!?")
-            return False
-
-        # update line state(s)
-        #
-        # ?XXX this fails on certain types of races?
         # assert len(lines) == 2
-        flume: Flume = self.feed.flumes[chart.linked.mkt.fqme]
+        if lines:
-        _, _, ratio = flume.get_ds_info()
+            flume: Flume = self.feed.flumes[chart.linked.mkt.fqme]
+            _, _, ratio = flume.get_ds_info()
 
-        for chart, shm in [
+            for chart, shm in [
-            (self.chart, flume.rt_shm),
+                (self.chart, flume.rt_shm),
-            (self.hist_chart, flume.hist_shm),
+                (self.hist_chart, flume.hist_shm),
-        ]:
+            ]:
-            viz = chart.get_viz(chart.name)
+                viz = chart.get_viz(chart.name)
-            index_field = viz.index_field
+                index_field = viz.index_field
-            arr = shm.array
+                arr = shm.array
 
-            # TODO: borked for int index based..
+                # TODO: borked for int index based..
-            index = flume.get_index(time_s, arr)
+                index = flume.get_index(time_s, arr)
 
-            # get absolute index for arrow placement
+                # get absolute index for arrow placement
-            arrow_index = arr[index_field][index]
+                arrow_index = arr[index_field][index]
 
-            self.arrows.add(
+                self.arrows.add(
-                chart.plotItem,
+                    chart.plotItem,
-                uuid,
+                    uuid,
-                arrow_index,
+                    arrow_index,
-                price,
+                    price,
-                pointing=pointing,
+                    pointing=pointing,
-                color=lines[0].color
+                    color=lines[0].color
-            )
+                )
+        else:
+            log.warn("No line(s) for order {uuid}!?")
 
     def on_cancel(
         self,
-        uuid: str,
+        uuid: str
 
-    ) -> bool:
+    ) -> None:
 
-        msg: Order|None = self.client._sent_orders.pop(uuid, None)
+        msg: Order = self.client._sent_orders.pop(uuid, None)
-        if msg is None:
+
+        if msg is not None:
+            self.lines.remove_line(uuid=uuid)
+            self.chart.linked.cursor.show_xhair()
+
+            dialog = self.dialogs.pop(uuid, None)
+            if dialog:
+                dialog.last_status_close()
+        else:
             log.warning(
                 f'Received cancel for unsubmitted order {pformat(msg)}'
             )
-            return False
 
-        # remove GUI line, show cursor.
+    def cancel_orders_under_cursor(self) -> list[str]:
-        self.lines.remove_line(uuid=uuid)
-        self.chart.linked.cursor.show_xhair()
-
-        # remove msg dialog (history)
-        dialog: Dialog|None = self.dialogs.pop(uuid, None)
-        if dialog:
-            dialog.last_status_close()
-
-        return True
-
-
-    def cancel_orders_under_cursor(self) -> list[Dialog]:
         return self.cancel_orders(
             self.oids_from_lines(
                 self.lines.lines_under_cursor()
@@ -687,28 +659,24 @@ class OrderMode:
         self,
         oids: list[str],
 
-    ) -> list[Dialog]:
+    ) -> None:
         '''
         Cancel all orders from a list of order ids: `oids`.
 
         '''
-        # key = self.multistatus.open_status(
+        key = self.multistatus.open_status(
-        #     f'cancelling {len(oids)} orders',
+            f'cancelling {len(oids)} orders',
-        #     final_msg=f'cancelled orders:\n{oids}',
+            final_msg=f'cancelled orders:\n{oids}',
-        #     group_key=True
+            group_key=True
-        # )
+        )
-        dialogs: list[Dialog] = []
         for oid in oids:
             if dialog := self.dialogs.get(oid):
                 self.client.cancel_nowait(uuid=oid)
-                # cancel_status_close = self.multistatus.open_status(
+                cancel_status_close = self.multistatus.open_status(
-                #     f'cancelling order {oid}',
+                    f'cancelling order {oid}',
-                #     group_key=key,
+                    group_key=key,
-                # )
+                )
-                # dialog.last_status_close = cancel_status_close
+                dialog.last_status_close = cancel_status_close
-                dialogs.append(dialog)
-
-        return dialogs
 
     def cancel_all_orders(self) -> None:
         '''
@@ -780,6 +748,7 @@ class OrderMode:
 
 @asynccontextmanager
 async def open_order_mode(
+
     feed: Feed,
     godw: GodWidget,
     fqme: str,
@@ -1088,23 +1057,13 @@ async def process_trade_msg(
     if name in (
         'position',
     ):
-        mkt: MktPair = mode.chart.linked.mkt
+        sym: MktPair = mode.chart.linked.mkt
         pp_msg_symbol = msg['symbol'].lower()
-        pp_msg_bsmktid = msg['bs_mktid']
+        fqme = sym.fqme
-        fqme = mkt.fqme
+        broker = sym.broker
-        broker = mkt.broker
         if (
-            # match on any backed-specific(-unique)-ID first!
-            (
-                pp_msg_bsmktid
-                and
-                mkt.bs_mktid == pp_msg_bsmktid
-            )
-            or
-            # OW try against what's provided as an FQME..
             pp_msg_symbol == fqme
-            or
+            or pp_msg_symbol == fqme.removesuffix(f'.{broker}')
-            pp_msg_symbol == fqme.removesuffix(f'.{broker}')
         ):
             log.info(
                 f'Loading position for `{fqme}`:\n'
@@ -1127,7 +1086,7 @@ async def process_trade_msg(
         return
 
     msg = Status(**msg)
-    # resp: str = msg.resp
+    resp = msg.resp
     oid = msg.oid
     dialog: Dialog = mode.dialogs.get(oid)
 
@@ -1191,33 +1150,20 @@ async def process_trade_msg(
                         mode.on_submit(oid)
 
         case Status(resp='error'):
-            # TODO: parse into broker-side msg, or should we
-            # expect it to just be **that** msg verbatim (since
-            # we'd presumably have only 1 `Error` msg-struct)
-            broker_msg: dict = msg.brokerd_msg
 
-            # XXX NOTE, this presumes the rxed "error" is
-            # order-dialog-cancel-causing, THUS backends much ONLY
-            # relay errors of this "severity"!!
-            log.error(
-                f'Order errored ??\n'
-                f'oid: {oid!r}\n'
-                f'\n'
-                f'{pformat(broker_msg)}\n'
-                f'\n'
-                f'=> CANCELLING ORDER DIALOG <=\n'
-
-                # from tractor.devx.pformat import ppfmt
-                # !TODO LOL, wtf the msg is causing
-                # a recursion bug!
-                # -[ ] get this shit on msgspec stat!
-                # f'{ppfmt(broker_msg)}'
-            )
             # do all the things for a cancel:
             # - drop order-msg dialog from client table
             # - delete level line from view
             mode.on_cancel(oid)
 
+            # TODO: parse into broker-side msg, or should we
+            # expect it to just be **that** msg verbatim (since
+            # we'd presumably have only 1 `Error` msg-struct)
+            broker_msg: dict = msg.brokerd_msg
+            log.error(
+                f'Order {oid}->{resp} with:\n{pformat(broker_msg)}'
+            )
+
         case Status(resp='canceled'):
             # delete level line from view
             mode.on_cancel(oid)
@@ -1232,10 +1178,10 @@ async def process_trade_msg(
             # TODO: UX for a "pending" clear/live order
             log.info(f'Dark order triggered for {fmtmsg}')
 
-        # TODO: do the struct-msg version, blah blah..
-        # req=Order(exec_mode='live', action='alert') as req,
         case Status(
             resp='triggered',
+            # TODO: do the struct-msg version, blah blah..
+            # req=Order(exec_mode='live', action='alert') as req,
             req={
                 'exec_mode': 'live',
                 'action': 'alert',

pyproject.toml

@@ -75,49 +75,60 @@ dependencies = [
     "trio-typing>=0.10.0",
     "numba>=0.61.0",
     "pyvnc",
-    "exchange-calendars>=4.13.1",
 ]
 # ------ dependencies ------
-# NOTE, by default we ship only a "headless" deps set bc
-# the `uis` group is not listed in the optional set.
 
-# [optional-dependencies]
+
-# uis = []
+# TODO: add an `--only daemon` group for running non-ui / pikerd
-# ?TODO? really we should be able to mv this `uis` group
+# service tree in distributed mode B)
-# to be under [optional-dependencies] and then include
-# it in the dev deps?
 # https://docs.astral.sh/uv/concepts/projects/dependencies/#optional-dependencies
-# -> uis should be included in pubbed pkgs.
-# [ ] uv seems to have no way to do this though?
-
-# TODO? move to a `uv.toml`?
-[tool.uv]
-# https://docs.astral.sh/uv/reference/settings/#python-preference
-python-preference = 'system'
-# https://docs.astral.sh/uv/reference/settings/#python-downloads
-python-downloads = 'manual'
-# https://docs.astral.sh/uv/concepts/projects/dependencies/#default-groups
-default-groups = [
-  'uis',
-  'repl',
-]
-# ------ tool.uv ------
 
 [dependency-groups]
 uis = [
-  "pyqtgraph",
+    # https://docs.astral.sh/uv/concepts/projects/dependencies/#optional-dependencies
-  "qdarkstyle >=3.0.2, <4.0.0",
+    # TODO: make sure the levenshtein shit compiles on nix..
-  "pyqt6 >=6.7.0, <7.0.0",
+    # rapidfuzz = {extras = ["speedup"], version = "^0.18.0"}
+    "rapidfuzz >=3.2.0, <4.0.0",
+    "qdarkstyle >=3.0.2, <4.0.0",
+    "pyqt6 >=6.7.0, <7.0.0",
+    "pyqtgraph",
 
-  # fuzzy search
+    # for consideration,
-  "rapidfuzz >=3.2.0, <4.0.0",
+    # - 'visidata'
+
+    "qdarkstyle >=3.0.2, <4.0.0",
+    "pyqt6 >=6.7.0, <7.0.0",
+    "pyqtgraph",
 ]
 
-# dev deps enabled by `uv --dev`
+# TODO: a toolset that makes debugging a `pikerd` service (tree) easy
-# https://docs.astral.sh/uv/concepts/projects/dependencies/#development-dependencies
+# to hack on directly using more or less the local env:
+# - xonsh + xxh
+# - rsyscall + pdbp
+# - actor runtime control console like BEAM/OTP
+#
+# console ehancements and eventually remote debugging extras/helpers.
+# use `uv --dev` to enable
+repl = [
+  # debug
+  "pdbp >=1.5.0, <2.0.0",
+    "greenback >=1.1.1, <2.0.0",
+  "xonsh",
+    "prompt-toolkit ==3.0.40",
+    "pyperclip>=1.9.0",
+
+]
+testing = [
+  "pytest",
+]
+de = [
+  # DE-specific
+  "i3ipc>=2.2.1",
+]
 dev = [
   # https://docs.astral.sh/uv/concepts/projects/dependencies/#development-dependencies
   "cython >=3.0.0, <4.0.0",
+
   # nested deps-groups
   # https://docs.astral.sh/uv/concepts/projects/dependencies/#nesting-groups
   {include-group = 'uis'},
@@ -125,38 +136,13 @@ dev = [
   {include-group = 'testing'},
   {include-group = 'de'},
 ]
-repl = [
-  # `tractor`'s debugger
-  "pdbp >=1.8.2, <2.0.0",
-    "greenback >=1.1.1, <2.0.0",
-
-  # @goodboy's preferred console toolz
-  "xonsh>=0.22.2",
-    "prompt-toolkit ==3.0.40",
-    "pyperclip>=1.9.0",
-
-  # for @claude's `snippets/claude_debug_helper.py` it uses to do
-  # "offline" debug/crash REPL-in alongside a dev.
-  "pexpect>=4.9.0",
-
-  # ?TODO, new stuff to consider..
-  # "visidata"  # console numerics
-  # "xxh"  # for remote `xonsh`-ing
-  # "rsyscall"  # (eventual) optional `tractor` backend
-  # - an actor-runtime-ctl console like BEAM/OTP
-]
-testing = [
-  "pytest",
-]
-de = [ # (linux) specific DEs
-  "i3ipc>=2.2.1",
-]
 lint = [
   # XXX, with flake.nix needs to be from nixpkgs
   "ruff>=0.9.6" 
+  #
+  # ^TODO? these markers don't work; use deps-flags for now?
   # ; os_name != 'nixos' and platform_system != 'NixOS'",
-  # ?TODO? since ^ markers won't work, use a deps-flags to toggle for
+  # ; defined('IN_NIX_SHELL')",
-  # now.
 ]
 dbs = [
   "elasticsearch >=8.9.0, <9.0.0",
@@ -191,16 +177,20 @@ include = ["piker"]
 # ------ tool.hatch ------
 
 
+# TODO? move to a `uv.toml`?
+[tool.uv]
+python-preference = 'system'
+python-downloads = 'manual'
+# https://docs.astral.sh/uv/concepts/projects/dependencies/#default-groups
+default-groups = ['uis', 'dev']
+# ------ tool.uv ------
+
+
 [tool.uv.sources]
 pyqtgraph = { git = "https://github.com/pikers/pyqtgraph.git" }
 tomlkit = { git = "https://github.com/pikers/tomlkit.git", branch ="piker_pin" }
 pyvnc = { git = "https://github.com/regulad/pyvnc.git" }
 
-# to get fancy next-cmd/suggestion feats prior to 0.22.2 B)
-# https://github.com/xonsh/xonsh/pull/6037
-# https://github.com/xonsh/xonsh/pull/6048
-# xonsh = { git = 'https://github.com/xonsh/xonsh.git', branch = 'main' }
-
 # XXX since, we're like, always hacking new shite all-the-time. Bp
 tractor = { git = "https://github.com/goodboy/tractor.git", branch ="piker_pin" }
 # tractor = { git = "https://pikers.dev/goodboy/tractor", branch = "piker_pin" }

snippets/claude_debug_helper.py

@@ -1,256 +0,0 @@
-#!/usr/bin/env python
-'''
-Programmatic debugging helper for `pdbp` REPL human-like
-interaction but built to allow `claude` to interact with 
-crashes and `tractor.pause()` breakpoints along side a human dev.
-
-Originally written by `clauded` during a backfiller inspection
-session with @goodboy trying to resolve duplicate/gappy ohlcv ts
-issues discovered while testing the new `nativedb` tsdb.
-
-Allows `claude` to run `pdb` commands and capture output in an "offline"
-manner but generating similar output as if it was iteracting with
-the debug REPL.
-
-The use of `pexpect` is heavily based on tractor's REPL UX test
-suite(s), namely various `tests/devx/test_debugger.py` patterns.
-
-'''
-import sys
-import os
-import time
-
-import pexpect
-from pexpect.exceptions import (
-    TIMEOUT,
-    EOF,
-)
-
-
-PROMPT: str = r'\(Pdb\+\)'
-
-
-def expect(
-    child: pexpect.spawn,
-    patt: str,
-    **kwargs,
-) -> None:
-    '''
-    Expect wrapper that prints last console data before failing.
-
-    '''
-    try:
-        child.expect(
-            patt,
-            **kwargs,
-        )
-    except TIMEOUT:
-        before: str = (
-            str(child.before.decode())
-            if isinstance(child.before, bytes)
-            else str(child.before)
-        )
-        print(
-            f'TIMEOUT waiting for pattern: {patt}\n'
-            f'Last seen output:\n{before}'
-        )
-        raise
-
-
-def run_pdb_commands(
-    commands: list[str],
-    initial_cmd: str = 'piker store ldshm xmrusdt.usdtm.perp.binance',
-    timeout: int = 30,
-    print_output: bool = True,
-) -> dict[str, str]:
-    '''
-    Spawn piker process, wait for pdb prompt, execute commands.
-
-    Returns dict mapping command -> output.
-
-    '''
-    results: dict[str, str] = {}
-
-    # Disable colored output for easier parsing
-    os.environ['PYTHON_COLORS'] = '0'
-
-    # Spawn the process
-    if print_output:
-        print(f'Spawning: {initial_cmd}')
-
-    child: pexpect.spawn = pexpect.spawn(
-        initial_cmd,
-        timeout=timeout,
-        encoding='utf-8',
-        echo=False,
-    )
-
-    # Wait for pdb prompt
-    try:
-        expect(child, PROMPT, timeout=timeout)
-        if print_output:
-            print('Reached pdb prompt!')
-
-        # Execute each command
-        for cmd in commands:
-            if print_output:
-                print(f'\n>>> {cmd}')
-
-            child.sendline(cmd)
-            time.sleep(0.1)
-
-            # Wait for next prompt
-            expect(child, PROMPT, timeout=timeout)
-
-            # Capture output (everything before the prompt)
-            output: str = (
-                str(child.before.decode())
-                if isinstance(child.before, bytes)
-                else str(child.before)
-            )
-            results[cmd] = output
-
-            if print_output:
-                print(output)
-
-        # Quit debugger gracefully
-        child.sendline('quit')
-        try:
-            child.expect(EOF, timeout=5)
-        except (TIMEOUT, EOF):
-            pass
-
-    except TIMEOUT as e:
-        print(f'Timeout: {e}')
-        if child.before:
-            before: str = (
-                str(child.before.decode())
-                if isinstance(child.before, bytes)
-                else str(child.before)
-            )
-            print(f'Buffer:\n{before}')
-        results['_error'] = str(e)
-
-    finally:
-        if child.isalive():
-            child.close(force=True)
-
-    return results
-
-
-class InteractivePdbSession:
-    '''
-    Interactive pdb session manager for incremental debugging.
-
-    '''
-    def __init__(
-        self,
-        cmd: str = 'piker store ldshm xmrusdt.usdtm.perp.binance',
-        timeout: int = 30,
-    ):
-        self.cmd: str = cmd
-        self.timeout: int = timeout
-        self.child: pexpect.spawn|None = None
-        self.history: list[tuple[str, str]] = []
-
-    def start(self) -> None:
-        '''
-        Start the piker process and wait for first prompt.
-
-        '''
-        os.environ['PYTHON_COLORS'] = '0'
-
-        print(f'Starting: {self.cmd}')
-        self.child = pexpect.spawn(
-            self.cmd,
-            timeout=self.timeout,
-            encoding='utf-8',
-            echo=False,
-        )
-
-        # Wait for initial prompt
-        expect(self.child, PROMPT, timeout=self.timeout)
-        print('Ready at pdb prompt!')
-
-    def run(
-        self,
-        cmd: str,
-        print_output: bool = True,
-    ) -> str:
-        '''
-        Execute a single pdb command and return output.
-
-        '''
-        if not self.child or not self.child.isalive():
-            raise RuntimeError('Session not started or dead')
-
-        if print_output:
-            print(f'\n>>> {cmd}')
-
-        self.child.sendline(cmd)
-        time.sleep(0.1)
-
-        # Wait for next prompt
-        expect(self.child, PROMPT, timeout=self.timeout)
-
-        output: str = (
-            str(self.child.before.decode())
-            if isinstance(self.child.before, bytes)
-            else str(self.child.before)
-        )
-        self.history.append((cmd, output))
-
-        if print_output:
-            print(output)
-
-        return output
-
-    def quit(self) -> None:
-        '''
-        Exit the debugger and cleanup.
-
-        '''
-        if self.child and self.child.isalive():
-            self.child.sendline('quit')
-            try:
-                self.child.expect(EOF, timeout=5)
-            except (TIMEOUT, EOF):
-                pass
-            self.child.close(force=True)
-
-    def __enter__(self):
-        self.start()
-        return self
-
-    def __exit__(self, *args):
-        self.quit()
-
-
-if __name__ == '__main__':
-    # Example inspection commands
-    inspect_cmds: list[str] = [
-        'locals().keys()',
-        'type(deduped)',
-        'deduped.shape',
-        (
-            'step_gaps.shape '
-            'if "step_gaps" in locals() '
-            'else "N/A"'
-        ),
-        (
-            'venue_gaps.shape '
-            'if "venue_gaps" in locals() '
-            'else "N/A"'
-        ),
-    ]
-
-    # Allow commands from CLI args
-    if len(sys.argv) > 1:
-        inspect_cmds = sys.argv[1:]
-
-    # Interactive session example
-    with InteractivePdbSession() as session:
-        for cmd in inspect_cmds:
-            session.run(cmd)
-
-    print('\n=== Session Complete ===')

tests/test_accounting.py

@@ -12,14 +12,12 @@ from piker import config
 from piker.accounting import (
     Account,
     calc,
-    open_account,
-    load_account,
-    load_account_from_ledger,
-    open_trade_ledger,
     Position,
     TransactionLedger,
+    open_trade_ledger,
+    load_account,
+    load_account_from_ledger,
 )
-import tractor
 
 
 def test_root_conf_networking_section(
@@ -55,17 +53,12 @@ def test_account_file_default_empty(
 )
 def test_paper_ledger_position_calcs(
     fq_acnt: tuple[str, str],
-    debug_mode: bool,
 ):
     broker: str
     acnt_name: str
     broker, acnt_name = fq_acnt
 
-    accounts_path: Path = (
+    accounts_path: Path = config.repodir() / 'tests' / '_inputs'
-        config.repodir()
-        / 'tests'
-        / '_inputs'  # tests-local-subdir
-    )
 
     ldr: TransactionLedger
     with (
@@ -84,7 +77,6 @@ def test_paper_ledger_position_calcs(
             ledger=ldr,
 
             _fp=accounts_path,
-            debug_mode=debug_mode,
 
         ) as (dfs, ledger),
 
@@ -110,87 +102,3 @@ def test_paper_ledger_position_calcs(
         df = dfs[xrp]
         assert df['cumsize'][-1] == 0
         assert pos.cumsize == 0
-
-
-
-@pytest.mark.parametrize(
-    'fq_acnt',
-    [
-        ('ib', 'algopaper'),
-    ],
-)
-def test_ib_account_with_duplicated_mktids(
-    fq_acnt: tuple[str, str],
-    debug_mode: bool,
-):
-    # ?TODO, once we start symcache-incremental-update-support?
-    # from piker.data import (
-    #     open_symcache,
-    # )
-    #
-    # async def main():
-    #     async with (
-    #         # TODO: do this as part of `open_account()`!?
-    #         open_symcache(
-    #             'ib',
-    #             only_from_memcache=True,
-    #         ) as symcache,
-    #     ):
-
-
-    from piker.brokers.ib.ledger import (
-        tx_sort,
-
-        # ?TODO, once we want to pull lowlevel txns and process them?
-        # norm_trade_records,
-        # update_ledger_from_api_trades,
-    )
-
-    broker: str
-    acnt_id: str = 'algopaper'
-    broker, acnt_id = fq_acnt
-    accounts_def = config.load_accounts([broker])
-    assert accounts_def[f'{broker}.{acnt_id}']
-
-    ledger: TransactionLedger
-    acnt: Account
-    with (
-        tractor.devx.maybe_open_crash_handler(pdb=debug_mode),
-
-        open_trade_ledger(
-            'ib',
-            acnt_id,
-            tx_sort=tx_sort,
-
-            # TODO, eventually incrementally updated for IB..
-            # symcache=symcache,
-            symcache=None,
-            allow_from_sync_code=True,
-
-        ) as ledger,
-
-        open_account(
-            'ib',
-            acnt_id,
-            write_on_exit=True,
-        ) as acnt,
-    ):
-        # per input params
-        symcache = ledger.symcache
-        assert not (
-            symcache.pairs
-            or
-            symcache.pairs
-            or
-            symcache.mktmaps
-        )
-        # re-compute all positions that have changed state.
-        # TODO: likely we should change the API to return the
-        # position updates from `.update_from_ledger()`?
-        active, closed = acnt.dump_active()
-
-        # breakpoint()
-
-        # TODO, (see above imports as well) incremental update from
-        #      (updated) ledger?
-        # -[ ] pull some code from `.ib.broker` content.

tests/test_ems.py

@@ -42,7 +42,7 @@ from piker.accounting import (
     unpack_fqme,
 )
 from piker.accounting import (
-    open_account,
+    open_pps,
     Position,
 )
 
@@ -136,7 +136,7 @@ def load_and_check_pos(
 
 ) -> None:
 
-    with open_account(ppmsg.broker, ppmsg.account) as table:
+    with open_pps(ppmsg.broker, ppmsg.account) as table:
 
         if ppmsg.size == 0:
             assert ppmsg.symbol not in table.pps

uv.lock

@@ -2,12 +2,8 @@ version = 1
 revision = 3
 requires-python = ">=3.12"
 resolution-markers = [
-    "python_full_version >= '3.14' and sys_platform == 'win32'",
+    "python_full_version >= '3.14'",
-    "python_full_version >= '3.14' and sys_platform == 'emscripten'",
+    "python_full_version < '3.14'",
-    "python_full_version >= '3.14' and sys_platform != 'emscripten' and sys_platform != 'win32'",
-    "python_full_version < '3.14' and sys_platform == 'win32'",
-    "python_full_version < '3.14' and sys_platform == 'emscripten'",
-    "python_full_version < '3.14' and sys_platform != 'emscripten' and sys_platform != 'win32'",
 ]
 
 [[package]]
@@ -420,23 +416,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8a/0e/97c33bf5009bdbac74fd2beace167cab3f978feb69cc36f1ef79360d6c4e/exceptiongroup-1.3.1-py3-none-any.whl", hash = "sha256:a7a39a3bd276781e98394987d3a5701d0c4edffb633bb7a5144577f82c773598", size = 16740, upload-time = "2025-11-21T23:01:53.443Z" },
 ]
 
-[[package]]
-name = "exchange-calendars"
-version = "4.13.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "korean-lunar-calendar" },
-    { name = "numpy" },
-    { name = "pandas" },
-    { name = "pyluach" },
-    { name = "toolz" },
-    { name = "tzdata" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/9e/fd/1bda66b3c2fefbf54b8cf765c9d8001b12654b5a897a21b0c6c9f55de5e3/exchange_calendars-4.13.1.tar.gz", hash = "sha256:42a4c7296da1f71b9625c668c9b3359cf5de4a2ffca28842b230e062bb4961ba", size = 4119843, upload-time = "2026-02-05T00:15:03.947Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/45/b7/fffe7d5a6da6be10b43be96640f31d4191e746de66b046cc1a6ea5fc4f26/exchange_calendars-4.13.1-py3-none-any.whl", hash = "sha256:cf39d2128a4da3ac253283f91ab63d79930a68196a3aac811091a4e38b6cbe49", size = 211538, upload-time = "2026-02-05T00:15:05.694Z" },
-]
-
 [[package]]
 name = "frozenlist"
 version = "1.8.0"
@@ -680,15 +659,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/42/d3/c3db0b92a0ff39c3e08f168cd382c24bf021d4a96fc89b47a3e55294f883/keysymdef-1.2.0-py2.py3-none-any.whl", hash = "sha256:19a5c2263a861f3ff884a1f58e2b4f7efa319ffc9d11f9ba8e20129babc31a9e", size = 20146, upload-time = "2023-02-25T00:22:36.318Z" },
 ]
 
-[[package]]
-name = "korean-lunar-calendar"
-version = "0.3.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/5a/93/a0bd2bd53ab19330e83ecc5652b7774ae86fd2fee19bc05ad220cf9db08b/korean_lunar_calendar-0.3.1.tar.gz", hash = "sha256:eb2c485124a061016926bdea6d89efdf9b9fdbf16db55895b6cf1e5bec17b857", size = 9877, upload-time = "2022-09-16T10:53:25.713Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/9c/96/30f3fe51b336bb6da4714f4fdad7bbdce8f13af79af2eb75e22908f3f9f4/korean_lunar_calendar-0.3.1-py3-none-any.whl", hash = "sha256:392757135c492c4f42a604e6038042953c35c6f449dda5f27e3f86a7f9c943e5", size = 9033, upload-time = "2022-09-16T10:53:23.771Z" },
-]
-
 [[package]]
 name = "llvmlite"
 version = "0.45.1"
@@ -983,70 +953,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" },
 ]
 
-[[package]]
-name = "pandas"
-version = "3.0.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "numpy" },
-    { name = "python-dateutil" },
-    { name = "tzdata", marker = "sys_platform == 'emscripten' or sys_platform == 'win32'" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/de/da/b1dc0481ab8d55d0f46e343cfe67d4551a0e14fcee52bd38ca1bd73258d8/pandas-3.0.0.tar.gz", hash = "sha256:0facf7e87d38f721f0af46fe70d97373a37701b1c09f7ed7aeeb292ade5c050f", size = 4633005, upload-time = "2026-01-21T15:52:04.726Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/0b/38/db33686f4b5fa64d7af40d96361f6a4615b8c6c8f1b3d334eee46ae6160e/pandas-3.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9803b31f5039b3c3b10cc858c5e40054adb4b29b4d81cb2fd789f4121c8efbcd", size = 10334013, upload-time = "2026-01-21T15:50:34.771Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/7b/9254310594e9774906bacdd4e732415e1f86ab7dbb4b377ef9ede58cd8ec/pandas-3.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:14c2a4099cd38a1d18ff108168ea417909b2dea3bd1ebff2ccf28ddb6a74d740", size = 9874154, upload-time = "2026-01-21T15:50:36.67Z" },
-    { url = "https://files.pythonhosted.org/packages/63/d4/726c5a67a13bc66643e66d2e9ff115cead482a44fc56991d0c4014f15aaf/pandas-3.0.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d257699b9a9960e6125686098d5714ac59d05222bef7a5e6af7a7fd87c650801", size = 10384433, upload-time = "2026-01-21T15:50:39.132Z" },
-    { url = "https://files.pythonhosted.org/packages/bf/2e/9211f09bedb04f9832122942de8b051804b31a39cfbad199a819bb88d9f3/pandas-3.0.0-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:69780c98f286076dcafca38d8b8eee1676adf220199c0a39f0ecbf976b68151a", size = 10864519, upload-time = "2026-01-21T15:50:41.043Z" },
-    { url = "https://files.pythonhosted.org/packages/00/8d/50858522cdc46ac88b9afdc3015e298959a70a08cd21e008a44e9520180c/pandas-3.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4a66384f017240f3858a4c8a7cf21b0591c3ac885cddb7758a589f0f71e87ebb", size = 11394124, upload-time = "2026-01-21T15:50:43.377Z" },
-    { url = "https://files.pythonhosted.org/packages/86/3f/83b2577db02503cd93d8e95b0f794ad9d4be0ba7cb6c8bcdcac964a34a42/pandas-3.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:be8c515c9bc33989d97b89db66ea0cececb0f6e3c2a87fcc8b69443a6923e95f", size = 11920444, upload-time = "2026-01-21T15:50:45.932Z" },
-    { url = "https://files.pythonhosted.org/packages/64/2d/4f8a2f192ed12c90a0aab47f5557ece0e56b0370c49de9454a09de7381b2/pandas-3.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:a453aad8c4f4e9f166436994a33884442ea62aa8b27d007311e87521b97246e1", size = 9730970, upload-time = "2026-01-21T15:50:47.962Z" },
-    { url = "https://files.pythonhosted.org/packages/d4/64/ff571be435cf1e643ca98d0945d76732c0b4e9c37191a89c8550b105eed1/pandas-3.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:da768007b5a33057f6d9053563d6b74dd6d029c337d93c6d0d22a763a5c2ecc0", size = 9041950, upload-time = "2026-01-21T15:50:50.422Z" },
-    { url = "https://files.pythonhosted.org/packages/6f/fa/7f0ac4ca8877c57537aaff2a842f8760e630d8e824b730eb2e859ffe96ca/pandas-3.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b78d646249b9a2bc191040988c7bb524c92fa8534fb0898a0741d7e6f2ffafa6", size = 10307129, upload-time = "2026-01-21T15:50:52.877Z" },
-    { url = "https://files.pythonhosted.org/packages/6f/11/28a221815dcea4c0c9414dfc845e34a84a6a7dabc6da3194498ed5ba4361/pandas-3.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bc9cba7b355cb4162442a88ce495e01cb605f17ac1e27d6596ac963504e0305f", size = 9850201, upload-time = "2026-01-21T15:50:54.807Z" },
-    { url = "https://files.pythonhosted.org/packages/ba/da/53bbc8c5363b7e5bd10f9ae59ab250fc7a382ea6ba08e4d06d8694370354/pandas-3.0.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3c9a1a149aed3b6c9bf246033ff91e1b02d529546c5d6fb6b74a28fea0cf4c70", size = 10354031, upload-time = "2026-01-21T15:50:57.463Z" },
-    { url = "https://files.pythonhosted.org/packages/f7/a3/51e02ebc2a14974170d51e2410dfdab58870ea9bcd37cda15bd553d24dc4/pandas-3.0.0-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:95683af6175d884ee89471842acfca29172a85031fccdabc35e50c0984470a0e", size = 10861165, upload-time = "2026-01-21T15:50:59.32Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/fe/05a51e3cac11d161472b8297bd41723ea98013384dd6d76d115ce3482f9b/pandas-3.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1fbbb5a7288719e36b76b4f18d46ede46e7f916b6c8d9915b756b0a6c3f792b3", size = 11359359, upload-time = "2026-01-21T15:51:02.014Z" },
-    { url = "https://files.pythonhosted.org/packages/ee/56/ba620583225f9b85a4d3e69c01df3e3870659cc525f67929b60e9f21dcd1/pandas-3.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8e8b9808590fa364416b49b2a35c1f4cf2785a6c156935879e57f826df22038e", size = 11912907, upload-time = "2026-01-21T15:51:05.175Z" },
-    { url = "https://files.pythonhosted.org/packages/c9/8c/c6638d9f67e45e07656b3826405c5cc5f57f6fd07c8b2572ade328c86e22/pandas-3.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:98212a38a709feb90ae658cb6227ea3657c22ba8157d4b8f913cd4c950de5e7e", size = 9732138, upload-time = "2026-01-21T15:51:07.569Z" },
-    { url = "https://files.pythonhosted.org/packages/7b/bf/bd1335c3bf1770b6d8fed2799993b11c4971af93bb1b729b9ebbc02ca2ec/pandas-3.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:177d9df10b3f43b70307a149d7ec49a1229a653f907aa60a48f1877d0e6be3be", size = 9033568, upload-time = "2026-01-21T15:51:09.484Z" },
-    { url = "https://files.pythonhosted.org/packages/8e/c6/f5e2171914d5e29b9171d495344097d54e3ffe41d2d85d8115baba4dc483/pandas-3.0.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2713810ad3806767b89ad3b7b69ba153e1c6ff6d9c20f9c2140379b2a98b6c98", size = 10741936, upload-time = "2026-01-21T15:51:11.693Z" },
-    { url = "https://files.pythonhosted.org/packages/51/88/9a0164f99510a1acb9f548691f022c756c2314aad0d8330a24616c14c462/pandas-3.0.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:15d59f885ee5011daf8335dff47dcb8a912a27b4ad7826dc6cbe809fd145d327", size = 10393884, upload-time = "2026-01-21T15:51:14.197Z" },
-    { url = "https://files.pythonhosted.org/packages/e0/53/b34d78084d88d8ae2b848591229da8826d1e65aacf00b3abe34023467648/pandas-3.0.0-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:24e6547fb64d2c92665dd2adbfa4e85fa4fd70a9c070e7cfb03b629a0bbab5eb", size = 10310740, upload-time = "2026-01-21T15:51:16.093Z" },
-    { url = "https://files.pythonhosted.org/packages/5b/d3/bee792e7c3d6930b74468d990604325701412e55d7aaf47460a22311d1a5/pandas-3.0.0-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:48ee04b90e2505c693d3f8e8f524dab8cb8aaf7ddcab52c92afa535e717c4812", size = 10700014, upload-time = "2026-01-21T15:51:18.818Z" },
-    { url = "https://files.pythonhosted.org/packages/55/db/2570bc40fb13aaed1cbc3fbd725c3a60ee162477982123c3adc8971e7ac1/pandas-3.0.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:66f72fb172959af42a459e27a8d8d2c7e311ff4c1f7db6deb3b643dbc382ae08", size = 11323737, upload-time = "2026-01-21T15:51:20.784Z" },
-    { url = "https://files.pythonhosted.org/packages/bc/2e/297ac7f21c8181b62a4cccebad0a70caf679adf3ae5e83cb676194c8acc3/pandas-3.0.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4a4a400ca18230976724a5066f20878af785f36c6756e498e94c2a5e5d57779c", size = 11771558, upload-time = "2026-01-21T15:51:22.977Z" },
-    { url = "https://files.pythonhosted.org/packages/0a/46/e1c6876d71c14332be70239acce9ad435975a80541086e5ffba2f249bcf6/pandas-3.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:940eebffe55528074341a5a36515f3e4c5e25e958ebbc764c9502cfc35ba3faa", size = 10473771, upload-time = "2026-01-21T15:51:25.285Z" },
-    { url = "https://files.pythonhosted.org/packages/c0/db/0270ad9d13c344b7a36fa77f5f8344a46501abf413803e885d22864d10bf/pandas-3.0.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:597c08fb9fef0edf1e4fa2f9828dd27f3d78f9b8c9b4a748d435ffc55732310b", size = 10312075, upload-time = "2026-01-21T15:51:28.5Z" },
-    { url = "https://files.pythonhosted.org/packages/09/9f/c176f5e9717f7c91becfe0f55a52ae445d3f7326b4a2cf355978c51b7913/pandas-3.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:447b2d68ac5edcbf94655fe909113a6dba6ef09ad7f9f60c80477825b6c489fe", size = 9900213, upload-time = "2026-01-21T15:51:30.955Z" },
-    { url = "https://files.pythonhosted.org/packages/d9/e7/63ad4cc10b257b143e0a5ebb04304ad806b4e1a61c5da25f55896d2ca0f4/pandas-3.0.0-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:debb95c77ff3ed3ba0d9aa20c3a2f19165cc7956362f9873fce1ba0a53819d70", size = 10428768, upload-time = "2026-01-21T15:51:33.018Z" },
-    { url = "https://files.pythonhosted.org/packages/9e/0e/4e4c2d8210f20149fd2248ef3fff26623604922bd564d915f935a06dd63d/pandas-3.0.0-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fedabf175e7cd82b69b74c30adbaa616de301291a5231138d7242596fc296a8d", size = 10882954, upload-time = "2026-01-21T15:51:35.287Z" },
-    { url = "https://files.pythonhosted.org/packages/c6/60/c9de8ac906ba1f4d2250f8a951abe5135b404227a55858a75ad26f84db47/pandas-3.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:412d1a89aab46889f3033a386912efcdfa0f1131c5705ff5b668dda88305e986", size = 11430293, upload-time = "2026-01-21T15:51:37.57Z" },
-    { url = "https://files.pythonhosted.org/packages/a1/69/806e6637c70920e5787a6d6896fd707f8134c2c55cd761e7249a97b7dc5a/pandas-3.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e979d22316f9350c516479dd3a92252be2937a9531ed3a26ec324198a99cdd49", size = 11952452, upload-time = "2026-01-21T15:51:39.618Z" },
-    { url = "https://files.pythonhosted.org/packages/cb/de/918621e46af55164c400ab0ef389c9d969ab85a43d59ad1207d4ddbe30a5/pandas-3.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:083b11415b9970b6e7888800c43c82e81a06cd6b06755d84804444f0007d6bb7", size = 9851081, upload-time = "2026-01-21T15:51:41.758Z" },
-    { url = "https://files.pythonhosted.org/packages/91/a1/3562a18dd0bd8c73344bfa26ff90c53c72f827df119d6d6b1dacc84d13e3/pandas-3.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:5db1e62cb99e739fa78a28047e861b256d17f88463c76b8dafc7c1338086dca8", size = 9174610, upload-time = "2026-01-21T15:51:44.312Z" },
-    { url = "https://files.pythonhosted.org/packages/ce/26/430d91257eaf366f1737d7a1c158677caaf6267f338ec74e3a1ec444111c/pandas-3.0.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:697b8f7d346c68274b1b93a170a70974cdc7d7354429894d5927c1effdcccd73", size = 10761999, upload-time = "2026-01-21T15:51:46.899Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/1a/954eb47736c2b7f7fe6a9d56b0cb6987773c00faa3c6451a43db4beb3254/pandas-3.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8cb3120f0d9467ed95e77f67a75e030b67545bcfa08964e349252d674171def2", size = 10410279, upload-time = "2026-01-21T15:51:48.89Z" },
-    { url = "https://files.pythonhosted.org/packages/20/fc/b96f3a5a28b250cd1b366eb0108df2501c0f38314a00847242abab71bb3a/pandas-3.0.0-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:33fd3e6baa72899746b820c31e4b9688c8e1b7864d7aec2de7ab5035c285277a", size = 10330198, upload-time = "2026-01-21T15:51:51.015Z" },
-    { url = "https://files.pythonhosted.org/packages/90/b3/d0e2952f103b4fbef1ef22d0c2e314e74fc9064b51cee30890b5e3286ee6/pandas-3.0.0-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a8942e333dc67ceda1095227ad0febb05a3b36535e520154085db632c40ad084", size = 10728513, upload-time = "2026-01-21T15:51:53.387Z" },
-    { url = "https://files.pythonhosted.org/packages/76/81/832894f286df828993dc5fd61c63b231b0fb73377e99f6c6c369174cf97e/pandas-3.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:783ac35c4d0fe0effdb0d67161859078618b1b6587a1af15928137525217a721", size = 11345550, upload-time = "2026-01-21T15:51:55.329Z" },
-    { url = "https://files.pythonhosted.org/packages/34/a0/ed160a00fb4f37d806406bc0a79a8b62fe67f29d00950f8d16203ff3409b/pandas-3.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:125eb901e233f155b268bbef9abd9afb5819db74f0e677e89a61b246228c71ac", size = 11799386, upload-time = "2026-01-21T15:51:57.457Z" },
-    { url = "https://files.pythonhosted.org/packages/36/c8/2ac00d7255252c5e3cf61b35ca92ca25704b0188f7454ca4aec08a33cece/pandas-3.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b86d113b6c109df3ce0ad5abbc259fe86a1bd4adfd4a31a89da42f84f65509bb", size = 10873041, upload-time = "2026-01-21T15:52:00.034Z" },
-    { url = "https://files.pythonhosted.org/packages/e6/3f/a80ac00acbc6b35166b42850e98a4f466e2c0d9c64054161ba9620f95680/pandas-3.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:1c39eab3ad38f2d7a249095f0a3d8f8c22cc0f847e98ccf5bbe732b272e2d9fa", size = 9441003, upload-time = "2026-01-21T15:52:02.281Z" },
-]
-
 [[package]]
 name = "pdbp"
-version = "1.8.2"
+version = "1.8.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama", marker = "sys_platform == 'win32'" },
     { name = "pygments" },
     { name = "tabcompleter" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/50/91/2d614b0db12840d646159f65510415ade0db9db595d6dee3eac60dfe9302/pdbp-1.8.2.tar.gz", hash = "sha256:367c25c17555d3ac1f024b9ad494ff50e6e20f6494a84741487f3e6596d88f94", size = 25843, upload-time = "2026-01-14T03:10:28.134Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fc/f5/794ef06a84b4aea5619cda8956aefb838c6b4849002079dca3bc8955f6e3/pdbp-1.8.1.tar.gz", hash = "sha256:e2acef6b14567b5599f624aec7378139cba086695c13a4e7e327ccb235c3a00b", size = 25812, upload-time = "2025-11-02T18:15:27.098Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/51/fe/53ac0cd932db5dcaf55961bc7cb7afdca8d80d8cc7406ed661f0c7dc111a/pdbp-1.8.2-py3-none-any.whl", hash = "sha256:d4fd05e177636b5ccd0b2e03e378cec57afc06149e5fd975de6f8ddb3d0109a8", size = 21969, upload-time = "2026-01-14T03:10:27.062Z" },
+    { url = "https://files.pythonhosted.org/packages/75/58/3af430d0de0b95d5adf7e576067e07d750ba76e28d142871982464fb40db/pdbp-1.8.1-py3-none-any.whl", hash = "sha256:643e8c84df7c09542c0c7c3f0f18a6c2fb4fb372f9f054ceca80a9037db986a5", size = 21950, upload-time = "2025-11-02T18:15:25.923Z" },
 ]
 
 [[package]]
@@ -1082,18 +1000,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/6e/23/e98758924d1b3aac11a626268eabf7f3cf177e7837c28d47bf84c64532d0/pendulum-3.1.0-py3-none-any.whl", hash = "sha256:f9178c2a8e291758ade1e8dd6371b1d26d08371b4c7730a6e9a3ef8b16ebae0f", size = 111799, upload-time = "2025-04-19T14:02:34.739Z" },
 ]
 
-[[package]]
-name = "pexpect"
-version = "4.9.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "ptyprocess" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523", size = 63772, upload-time = "2023-11-25T06:56:14.81Z" },
-]
-
 [[package]]
 name = "piker"
 version = "0.1.0a0.dev0"
@@ -1105,7 +1011,6 @@ dependencies = [
     { name = "colorama" },
     { name = "colorlog" },
     { name = "cryptofeed" },
-    { name = "exchange-calendars" },
     { name = "httpx" },
     { name = "ib-insync" },
     { name = "msgspec" },
@@ -1142,7 +1047,6 @@ dev = [
     { name = "greenback" },
     { name = "i3ipc" },
     { name = "pdbp" },
-    { name = "pexpect" },
     { name = "prompt-toolkit" },
     { name = "pyperclip" },
     { name = "pyqt6" },
@@ -1158,7 +1062,6 @@ lint = [
 repl = [
     { name = "greenback" },
     { name = "pdbp" },
-    { name = "pexpect" },
     { name = "prompt-toolkit" },
     { name = "pyperclip" },
     { name = "xonsh" },
@@ -1181,7 +1084,6 @@ requires-dist = [
     { name = "colorama", specifier = ">=0.4.6,<0.5.0" },
     { name = "colorlog", specifier = ">=6.7.0,<7.0.0" },
     { name = "cryptofeed", specifier = ">=2.4.0,<3.0.0" },
-    { name = "exchange-calendars", specifier = ">=4.13.1" },
     { name = "httpx", specifier = ">=0.27.0,<0.28.0" },
     { name = "ib-insync", specifier = ">=0.9.86,<0.10.0" },
     { name = "msgspec", specifier = ">=0.19.0,<0.20" },
@@ -1213,8 +1115,7 @@ dev = [
     { name = "cython", specifier = ">=3.0.0,<4.0.0" },
     { name = "greenback", specifier = ">=1.1.1,<2.0.0" },
     { name = "i3ipc", specifier = ">=2.2.1" },
-    { name = "pdbp", specifier = ">=1.8.2,<2.0.0" },
+    { name = "pdbp", specifier = ">=1.5.0,<2.0.0" },
-    { name = "pexpect", specifier = ">=4.9.0" },
     { name = "prompt-toolkit", specifier = "==3.0.40" },
     { name = "pyperclip", specifier = ">=1.9.0" },
     { name = "pyqt6", specifier = ">=6.7.0,<7.0.0" },
@@ -1222,16 +1123,15 @@ dev = [
     { name = "pytest" },
     { name = "qdarkstyle", specifier = ">=3.0.2,<4.0.0" },
     { name = "rapidfuzz", specifier = ">=3.2.0,<4.0.0" },
-    { name = "xonsh", specifier = ">=0.22.2" },
+    { name = "xonsh" },
 ]
 lint = [{ name = "ruff", specifier = ">=0.9.6" }]
 repl = [
     { name = "greenback", specifier = ">=1.1.1,<2.0.0" },
-    { name = "pdbp", specifier = ">=1.8.2,<2.0.0" },
+    { name = "pdbp", specifier = ">=1.5.0,<2.0.0" },
-    { name = "pexpect", specifier = ">=4.9.0" },
     { name = "prompt-toolkit", specifier = "==3.0.40" },
     { name = "pyperclip", specifier = ">=1.9.0" },
-    { name = "xonsh", specifier = ">=0.22.2" },
+    { name = "xonsh" },
 ]
 testing = [{ name = "pytest" }]
 uis = [
@@ -1243,11 +1143,11 @@ uis = [
 
 [[package]]
 name = "platformdirs"
-version = "4.6.0"
+version = "4.5.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/20/e5/474d0a8508029286b905622e6929470fb84337cfa08f9d09fbb624515249/platformdirs-4.6.0.tar.gz", hash = "sha256:4a13c2db1071e5846c3b3e04e5b095c0de36b2a24be9a3bc0145ca66fce4e328", size = 23433, upload-time = "2026-02-12T14:36:21.288Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cf/86/0248f086a84f01b37aaec0fa567b397df1a119f73c16f6c7a9aac73ea309/platformdirs-4.5.1.tar.gz", hash = "sha256:61d5cdcc6065745cdd94f0f878977f8de9437be93de97c1c12f853c9c0cdcbda", size = 21715, upload-time = "2025-12-05T13:52:58.638Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/da/10/1b0dcf51427326f70e50d98df21b18c228117a743a1fc515a42f8dc7d342/platformdirs-4.6.0-py3-none-any.whl", hash = "sha256:dd7f808d828e1764a22ebff09e60f175ee3c41876606a6132a688d809c7c9c73", size = 19549, upload-time = "2026-02-12T14:36:19.743Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/28/3bfe2fa5a7b9c46fe7e13c97bda14c895fb10fa2ebf1d0abb90e0cea7ee1/platformdirs-4.5.1-py3-none-any.whl", hash = "sha256:d03afa3963c806a9bed9d5125c8f4cb2fdaf74a55ab60e5d59b3fde758104d31", size = 18731, upload-time = "2025-12-05T13:52:56.823Z" },
 ]
 
 [[package]]
@@ -1397,15 +1297,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/5b/5a/bc7b4a4ef808fa59a816c17b20c4bef6884daebbdf627ff2a161da67da19/propcache-0.4.1-py3-none-any.whl", hash = "sha256:af2a6052aeb6cf17d3e46ee169099044fd8224cbaf75c76a2ef596e8163e2237", size = 13305, upload-time = "2025-10-08T19:49:00.792Z" },
 ]
 
-[[package]]
-name = "ptyprocess"
-version = "0.7.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220", size = 70762, upload-time = "2020-12-28T15:15:30.155Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35", size = 13993, upload-time = "2020-12-28T15:15:28.35Z" },
-]
-
 [[package]]
 name = "pyarrow"
 version = "22.0.0"
@@ -1530,15 +1421,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" },
 ]
 
-[[package]]
-name = "pyluach"
-version = "2.3.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/11/11/42568c1568a75f8803c59f26d29af01a0890352b7a8e03d41ecda8bfb5dd/pyluach-2.3.0.tar.gz", hash = "sha256:ec6e30669d1df50c9ca160486da44a8195bb4c7a5d3d533990d0c5b03accd281", size = 26910, upload-time = "2025-09-09T20:24:39.651Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/8a/c8/f96208ade3ca4c23b372497d0788bcf0f2e0ff4310e5ee693366bc33fdf0/pyluach-2.3.0-py3-none-any.whl", hash = "sha256:4497b731aef59508b079dbf5f00bc5bf4329ac45090a6cd37b5a83756f0e69ab", size = 25914, upload-time = "2025-09-09T20:24:37.831Z" },
-]
-
 [[package]]
 name = "pyperclip"
 version = "1.11.0"
@@ -1958,19 +1840,10 @@ name = "tomlkit"
 version = "0.11.8"
 source = { git = "https://github.com/pikers/tomlkit.git?branch=piker_pin#8e0239a766e96739da700cd87cc00b48dbe7451f" }
 
-[[package]]
-name = "toolz"
-version = "1.1.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/11/d6/114b492226588d6ff54579d95847662fc69196bdeec318eb45393b24c192/toolz-1.1.0.tar.gz", hash = "sha256:27a5c770d068c110d9ed9323f24f1543e83b2f300a687b7891c1a6d56b697b5b", size = 52613, upload-time = "2025-10-17T04:03:21.661Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/fb/12/5911ae3eeec47800503a238d971e51722ccea5feb8569b735184d5fcdbc0/toolz-1.1.0-py3-none-any.whl", hash = "sha256:15ccc861ac51c53696de0a5d6d4607f99c210739caf987b5d2054f3efed429d8", size = 58093, upload-time = "2025-10-17T04:03:20.435Z" },
-]
-
 [[package]]
 name = "tractor"
 version = "0.1.0a6.dev0"
-source = { git = "https://github.com/goodboy/tractor.git?branch=piker_pin#36307c59175a1d04fecc77ef2c28f5c943b5f3d1" }
+source = { git = "https://github.com/goodboy/tractor.git?branch=piker_pin#e232d9dd06f41b8dca997f0647f2083d27cc34f2" }
 dependencies = [
     { name = "bidict" },
     { name = "cffi" },
@@ -2222,13 +2095,13 @@ wheels = [
 
 [[package]]
 name = "xonsh"
-version = "0.22.4"
+version = "0.20.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/48/df/1fc9ed62b3d7c14612e1713e9eb7bd41d54f6ad1028a8fbb6b7cddebc345/xonsh-0.22.4.tar.gz", hash = "sha256:6be346563fec2db75778ba5d2caee155525e634e99d9cc8cc347626025c0b3fa", size = 826665, upload-time = "2026-02-17T07:53:39.424Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/56/af/7e2ba3885da44cbe03c7ff46f90ea917ba10d91dc74d68604001ea28055f/xonsh-0.20.0.tar.gz", hash = "sha256:d44a50ee9f288ff96bd0456f0a38988ef6d4985637140ea793beeef5ec5d2d38", size = 811907, upload-time = "2025-11-24T07:50:50.847Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2e/00/7cbc0c1fb64365a0a317c54ce3a151c9644eea5a509d9cbaae61c9fd1426/xonsh-0.22.4-py311-none-any.whl", hash = "sha256:38b29b29fa85aa756462d9d9bbcaa1d85478c2108da3de6cc590a69a4bcd1a01", size = 654375, upload-time = "2026-02-17T07:53:37.702Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/db/1c5c057c0b2a89b8919477726558685720ae0849ea1a98a3803e93550824/xonsh-0.20.0-py311-none-any.whl", hash = "sha256:65d27ba31d558f79010d6c652751449fd3ed4df1f1eda78040a6427fa0a0f03e", size = 646312, upload-time = "2025-11-24T07:50:49.488Z" },
-    { url = "https://files.pythonhosted.org/packages/2e/c2/3dd498dc28d8f89cdd52e39950c5e591499ae423f61694c0bb4d03ed1d82/xonsh-0.22.4-py312-none-any.whl", hash = "sha256:4e538fac9f4c3d866ddbdeca068f0c0515469c997ed58d3bfee963878c6df5a5", size = 654300, upload-time = "2026-02-17T07:53:35.813Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/a2/d6f7534f31489a4b8b54bd2a2496248f86f7c21a6a6ce9bfdcdd389fe4e7/xonsh-0.20.0-py312-none-any.whl", hash = "sha256:3148900e67b9c2796bef6f2eda003b0a64d4c6f50a0db23324f786d9e1af9353", size = 646323, upload-time = "2025-11-24T07:50:43.028Z" },
-    { url = "https://files.pythonhosted.org/packages/82/7d/1f9c7147518e9f03f6ce081b5bfc4f1aceb6ec5caba849024d005e41d3be/xonsh-0.22.4-py313-none-any.whl", hash = "sha256:cc5fabf0ad0c56a2a11bed1e6a43c4ec6416a5b30f24f126b8e768547c3793e2", size = 654818, upload-time = "2026-02-17T07:53:33.477Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/48/bcb1e4d329c3d522bc29b066b0b6ee86938ec392376a29c36fac0ad1c586/xonsh-0.20.0-py313-none-any.whl", hash = "sha256:c83daaf6eb2960180fc5a507459dbdf6c0d6d63e1733c43f4e43db77255c7278", size = 646830, upload-time = "2025-11-24T07:50:45.078Z" },
 ]
 
 [[package]]