ib: support remote host vnc client connections
I figure we might as well support multiple types of distributed multi-host setups; why not allow running the API (gateway) and thus vnc server on a diff host and allowing clients to connect and do their thing B) Deatz: - make `ib._util.data_reset_hack()` take in a `vnc_host` which gets proxied through to the `asyncvnc` client. - pull `ib_insync.client.Client` host value and pass-through to data reset machinery, presuming the vnc server is running in the same container (and/or the same host). - if no vnc connection **and** no i3ipc trick can be used, just report to the user that they need to remove the data throttle manually. - fix `feed.get_bars()` to handle throttle cases the same based on error msg matching, not error the code and add a max `_failed_resets` count to trigger bailing on the query loop.master
Tyler Goodlet
parent
7ff8aa1ba0
commit
957224bdc5
|
|
@ -32,7 +32,10 @@ import tractor
|
|||
from .._util import log
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .api import MethodProxy
|
||||
from .api import (
|
||||
MethodProxy,
|
||||
ib_Client
|
||||
)
|
||||
|
||||
|
||||
_reset_tech: Literal[
|
||||
|
|
@ -47,9 +50,8 @@ _reset_tech: Literal[
|
|||
|
||||
|
||||
async def data_reset_hack(
|
||||
proxy: MethodProxy,
|
||||
reset_type: str = 'data',
|
||||
**kwargs,
|
||||
vnc_host: str,
|
||||
reset_type: Literal['data', 'connection'],
|
||||
|
||||
) -> None:
|
||||
'''
|
||||
|
|
@ -79,9 +81,13 @@ async def data_reset_hack(
|
|||
that need to be wrangle.
|
||||
|
||||
'''
|
||||
global _reset_tech
|
||||
|
||||
client: 'IBCLIENTTHING' = proxy._aio_ns.ib.client
|
||||
no_setup_msg:str = (
|
||||
'No data reset hack test setup for {vnc_host}!\n'
|
||||
'See setup @\n'
|
||||
'https://github.com/pikers/piker/tree/master/piker/brokers/ib'
|
||||
)
|
||||
global _reset_tech
|
||||
|
||||
match _reset_tech:
|
||||
case 'vnc':
|
||||
|
|
@ -89,15 +95,26 @@ async def data_reset_hack(
|
|||
await tractor.to_asyncio.run_task(
|
||||
partial(
|
||||
vnc_click_hack,
|
||||
host=client.host,
|
||||
host=vnc_host,
|
||||
)
|
||||
)
|
||||
except OSError:
|
||||
_reset_tech = 'i3ipc_xdotool'
|
||||
if vnc_host != 'localhost':
|
||||
log.warning(no_setup_msg)
|
||||
return False
|
||||
|
||||
try:
|
||||
import i3ipc
|
||||
except ModuleNotFoundError:
|
||||
log.warning(no_setup_msg)
|
||||
return False
|
||||
|
||||
try:
|
||||
i3ipc_xdotool_manual_click_hack()
|
||||
_reset_tech = 'i3ipc_xdotool'
|
||||
return True
|
||||
except OSError:
|
||||
log.exception(no_setup_msg)
|
||||
return False
|
||||
|
||||
case 'i3ipc_xdotool':
|
||||
|
|
@ -119,9 +136,21 @@ async def vnc_click_hack(
|
|||
ib gateway using magic combos.
|
||||
|
||||
'''
|
||||
key = {'data': 'f', 'connection': 'r'}[reset_type]
|
||||
|
||||
try:
|
||||
import asyncvnc
|
||||
except ModuleNotFoundError:
|
||||
log.warning(
|
||||
"In order to leverage `piker`'s built-in data reset hacks, install "
|
||||
"the `asyncvnc` project: https://github.com/barneygale/asyncvnc"
|
||||
)
|
||||
return
|
||||
|
||||
# two different hot keys which trigger diff types of reset
|
||||
# requests B)
|
||||
key = {
|
||||
'data': 'f',
|
||||
'connection': 'r'
|
||||
}[reset_type]
|
||||
|
||||
async with asyncvnc.connect(
|
||||
host,
|
||||
|
|
@ -140,8 +169,6 @@ async def vnc_click_hack(
|
|||
|
||||
|
||||
def i3ipc_xdotool_manual_click_hack() -> None:
|
||||
import i3ipc
|
||||
|
||||
i3 = i3ipc.Connection()
|
||||
t = i3.get_tree()
|
||||
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ _pacing: str = (
|
|||
async def wait_on_data_reset(
|
||||
proxy: MethodProxy,
|
||||
reset_type: str = 'data',
|
||||
timeout: float = 16,
|
||||
timeout: float = float('inf'),
|
||||
|
||||
task_status: TaskStatus[
|
||||
tuple[
|
||||
|
|
@ -228,7 +228,7 @@ async def wait_on_data_reset(
|
|||
'HMDS data farm connection is OK:ushmds'
|
||||
)
|
||||
|
||||
# XXX: other event messages we might want to try and
|
||||
# TODO: other event messages we might want to try and
|
||||
# wait for but i wasn't able to get any of this
|
||||
# reliable..
|
||||
# reconnect_start = proxy.status_event(
|
||||
|
|
@ -239,14 +239,21 @@ async def wait_on_data_reset(
|
|||
# )
|
||||
# try to wait on the reset event(s) to arrive, a timeout
|
||||
# will trigger a retry up to 6 times (for now).
|
||||
client = proxy._aio_ns.ib.client
|
||||
|
||||
done = trio.Event()
|
||||
with trio.move_on_after(timeout) as cs:
|
||||
|
||||
task_status.started((cs, done))
|
||||
|
||||
log.warning('Sending DATA RESET request')
|
||||
res = await data_reset_hack(reset_type=reset_type)
|
||||
log.warning(
|
||||
'Sending DATA RESET request:\n'
|
||||
f'{client}'
|
||||
)
|
||||
res = await data_reset_hack(
|
||||
vnc_host=client.host,
|
||||
reset_type=reset_type,
|
||||
)
|
||||
|
||||
if not res:
|
||||
log.warning(
|
||||
|
|
@ -280,7 +287,7 @@ async def wait_on_data_reset(
|
|||
|
||||
|
||||
_data_resetter_task: trio.Task | None = None
|
||||
|
||||
_failed_resets: int = 0
|
||||
|
||||
async def get_bars(
|
||||
|
||||
|
|
@ -299,6 +306,7 @@ async def get_bars(
|
|||
# history queries for instrument, presuming that most don't
|
||||
# not trade for a week XD
|
||||
max_nodatas: int = 6,
|
||||
max_failed_resets: int = 6,
|
||||
|
||||
task_status: TaskStatus[trio.CancelScope] = trio.TASK_STATUS_IGNORED,
|
||||
|
||||
|
|
@ -308,7 +316,7 @@ async def get_bars(
|
|||
a ``MethoProxy``.
|
||||
|
||||
'''
|
||||
global _data_resetter_task
|
||||
global _data_resetter_task, _failed_resets
|
||||
nodatas_count: int = 0
|
||||
|
||||
data_cs: trio.CancelScope | None = None
|
||||
|
|
@ -321,8 +329,11 @@ async def get_bars(
|
|||
result_ready = trio.Event()
|
||||
|
||||
async def query():
|
||||
|
||||
global _failed_resets
|
||||
nonlocal result, data_cs, end_dt, nodatas_count
|
||||
while True:
|
||||
|
||||
while _failed_resets < max_failed_resets:
|
||||
try:
|
||||
out = await proxy.bars(
|
||||
fqsn=fqsn,
|
||||
|
|
@ -382,8 +393,7 @@ async def get_bars(
|
|||
f'Symbol: {fqsn}',
|
||||
)
|
||||
|
||||
elif err.code == 162:
|
||||
if (
|
||||
elif (
|
||||
'HMDS query returned no data' in msg
|
||||
):
|
||||
# XXX: this is now done in the storage mgmt
|
||||
|
|
@ -433,8 +443,11 @@ async def get_bars(
|
|||
'Resetting farms with `ctrl-alt-f` hack\n'
|
||||
)
|
||||
|
||||
client = proxy._aio_ns.ib.client
|
||||
|
||||
# cancel any existing reset task
|
||||
if data_cs:
|
||||
log.cancel(f'Cancelling existing reset for {client}')
|
||||
data_cs.cancel()
|
||||
|
||||
# spawn new data reset task
|
||||
|
|
@ -442,10 +455,13 @@ async def get_bars(
|
|||
partial(
|
||||
wait_on_data_reset,
|
||||
proxy,
|
||||
timeout=float('inf'),
|
||||
reset_type='connection'
|
||||
)
|
||||
)
|
||||
if reset_done:
|
||||
_failed_resets = 0
|
||||
else:
|
||||
_failed_resets += 1
|
||||
continue
|
||||
|
||||
else:
|
||||
|
|
@ -482,7 +498,7 @@ async def get_bars(
|
|||
partial(
|
||||
wait_on_data_reset,
|
||||
proxy,
|
||||
timeout=float('inf'),
|
||||
reset_type='data',
|
||||
)
|
||||
)
|
||||
# sync wait on reset to complete
|
||||
|
|
|
|||
Loading…
Reference in New Issue