From 799c9f45b426b70558d6a5ce05b08eea7d19a704 Mon Sep 17 00:00:00 2001 From: goodboy Date: Mon, 23 Mar 2026 23:55:07 -0400 Subject: [PATCH] Update `tractor` private-API refs across codebase Port internal `tractor._` references to their new public or reorganized paths after `tractor` refactored its subpkg layout. Deats, - `tractor._portal.Portal` -> `tractor.Portal`. - `tractor._supervise.ActorNursery` -> `tractor.ActorNursery`. - `tractor._multiaddr` -> `tractor.discovery._multiaddr`. - `tractor._addr` -> `tractor.discovery._addr`. - `tractor._state._runtime_vars` -> `tractor.runtime._state._runtime_vars`. - `tractor._state.is_debug_mode()` -> `tractor.runtime._state.is_debug_mode()`. Files touched: `brokers/data.py`, `cli/__init__.py`, `data/feed.py`, `service/_actor_runtime.py`, `service/_mngr.py`, `storage/cli.py`, `tsp/_annotate.py`, `ui/kivy/monitor.py`, `ui/kivy/option_chain.py`. (this commit msg was generated in some part by [`claude-code`][claude-code-gh]) [claude-code-gh]: https://github.com/anthropics/claude-code --- piker/brokers/data.py | 2 +- piker/cli/__init__.py | 4 ++-- piker/data/feed.py | 2 +- piker/service/_actor_runtime.py | 4 ++-- piker/service/_mngr.py | 2 +- piker/storage/cli.py | 2 +- piker/tsp/_annotate.py | 2 +- piker/ui/kivy/monitor.py | 2 +- piker/ui/kivy/option_chain.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/piker/brokers/data.py b/piker/brokers/data.py index 12010ede..92627bd5 100644 --- a/piker/brokers/data.py +++ b/piker/brokers/data.py @@ -425,7 +425,7 @@ class DataFeed: async def stream_to_file( watchlist_name: str, filename: str, - portal: tractor._portal.Portal, + portal: tractor.Portal, tickers: List[str], brokermod: ModuleType, rate: int, diff --git a/piker/cli/__init__.py b/piker/cli/__init__.py index f469242e..1d3bad25 100644 --- a/piker/cli/__init__.py +++ b/piker/cli/__init__.py @@ -27,7 +27,7 @@ from types import ModuleType import click import trio import tractor -from tractor._multiaddr import parse_maddr +from tractor.discovery._multiaddr import parse_maddr from ..log import ( get_console_log, @@ -345,7 +345,7 @@ def services( if not ports: ports: list[int] = [_default_registry_port] - addr = tractor._addr.wrap_address( + addr = tractor.discovery._addr.wrap_address( addr=(host, ports[0]) ) diff --git a/piker/data/feed.py b/piker/data/feed.py index df4f5fae..f10d66e7 100644 --- a/piker/data/feed.py +++ b/piker/data/feed.py @@ -77,7 +77,7 @@ from ._sampling import ( if TYPE_CHECKING: from .flows import Flume - from tractor._addr import Address + from tractor.discovery._addr import Address from tractor.msg.types import Aid diff --git a/piker/service/_actor_runtime.py b/piker/service/_actor_runtime.py index 9991c027..b80cd072 100644 --- a/piker/service/_actor_runtime.py +++ b/piker/service/_actor_runtime.py @@ -91,7 +91,7 @@ async def open_piker_runtime( try: actor = tractor.current_actor() except tractor._exceptions.NoRuntime: - tractor._state._runtime_vars[ + tractor.runtime._state._runtime_vars[ 'piker_vars' ] = tractor_runtime_overrides @@ -264,7 +264,7 @@ async def maybe_open_pikerd( **kwargs, ) -> ( - tractor._portal.Portal + tractor.Portal |ClassVar[Services] ): ''' diff --git a/piker/service/_mngr.py b/piker/service/_mngr.py index 38fc1a3e..cc5de90a 100644 --- a/piker/service/_mngr.py +++ b/piker/service/_mngr.py @@ -48,7 +48,7 @@ log = get_logger(name=__name__) # new actors and supervises them to completion? class Services: - actor_n: tractor._supervise.ActorNursery + actor_n: tractor.ActorNursery service_n: trio.Nursery debug_mode: bool # tractor sub-actor debug mode flag service_tasks: dict[ diff --git a/piker/storage/cli.py b/piker/storage/cli.py index c9a7cc5f..78138de1 100644 --- a/piker/storage/cli.py +++ b/piker/storage/cli.py @@ -306,7 +306,7 @@ def ldshm( # TODO: call null-seg fixer somehow? if null_segs: - if tractor._state.is_debug_mode(): + if tractor.runtime._state.is_debug_mode(): await tractor.pause() # async with ( # trio.open_nursery() as tn, diff --git a/piker/tsp/_annotate.py b/piker/tsp/_annotate.py index bbf50437..27a46ced 100644 --- a/piker/tsp/_annotate.py +++ b/piker/tsp/_annotate.py @@ -196,7 +196,7 @@ async def markup_gaps( prev_r: pl.DataFrame = prev_row_by_i # debug any missing pre-row - if tractor._state.is_debug_mode(): + if tractor.runtime._state.is_debug_mode(): await tractor.pause() istart: int = prev_r['index'][0] diff --git a/piker/ui/kivy/monitor.py b/piker/ui/kivy/monitor.py index 6bb45bfd..e6ac02d9 100644 --- a/piker/ui/kivy/monitor.py +++ b/piker/ui/kivy/monitor.py @@ -167,7 +167,7 @@ async def stream_symbol_selection(): async def _async_main( name: str, - portal: tractor._portal.Portal, + portal: tractor.Portal, symbols: List[str], brokermod: ModuleType, loglevel: str = 'info', diff --git a/piker/ui/kivy/option_chain.py b/piker/ui/kivy/option_chain.py index cfa0e665..55161339 100644 --- a/piker/ui/kivy/option_chain.py +++ b/piker/ui/kivy/option_chain.py @@ -436,7 +436,7 @@ class OptionChain(object): async def new_chain_ui( - portal: tractor._portal.Portal, + portal: tractor.Portal, symbol: str, brokermod: types.ModuleType, rate: int = 1,