Compare commits
32 Commits
main
...
alt_tpts_f
| Author | SHA1 | Date |
|---|---|---|
|
|
2074eeea4f | |
|
|
1799171705 | |
|
|
cffefac615 | |
|
|
fc2d727fdb | |
|
|
05dde42f70 | |
|
|
04e423e6bd | |
|
|
793a454463 | |
|
|
b8b4f1b80f | |
|
|
1cf041d8e6 | |
|
|
831b6cfb21 | |
|
|
e5f7e8de9d | |
|
|
871bb2620e | |
|
|
de980a69e0 | |
|
|
ab9f01caf2 | |
|
|
d85632ba9b | |
|
|
8294ca6487 | |
|
|
87385a4e2d | |
|
|
b3c5478017 | |
|
|
6c9a78c5a0 | |
|
|
da223f7a55 | |
|
|
49fe0a3398 | |
|
|
29fc3b8a8b | |
|
|
1bfe777637 | |
|
|
c694d915f1 | |
|
|
c120cb51a4 | |
|
|
7c20231f16 | |
|
|
d809c79788 | |
|
|
9f2f8a1664 | |
|
|
9f141635d1 | |
|
|
0604ca7c82 | |
|
|
82c2256271 | |
|
|
a743fa28b5 |
|
|
@ -1,5 +1,6 @@
|
||||||
|
################
|
||||||
# ---- CEXY ----
|
# ---- CEXY ----
|
||||||
|
################
|
||||||
[binance]
|
[binance]
|
||||||
accounts.paper = 'paper'
|
accounts.paper = 'paper'
|
||||||
|
|
||||||
|
|
@ -12,41 +13,28 @@ accounts.spot = 'spot'
|
||||||
spot.use_testnet = false
|
spot.use_testnet = false
|
||||||
spot.api_key = ''
|
spot.api_key = ''
|
||||||
spot.api_secret = ''
|
spot.api_secret = ''
|
||||||
# ------ binance ------
|
|
||||||
|
|
||||||
|
|
||||||
[deribit]
|
[deribit]
|
||||||
# std assets
|
|
||||||
key_id = ''
|
key_id = ''
|
||||||
key_secret = ''
|
key_secret = ''
|
||||||
# options
|
|
||||||
accounts.option = 'option'
|
|
||||||
option.use_testnet = false
|
|
||||||
option.key_id = ''
|
|
||||||
option.key_secret = ''
|
|
||||||
# aux logging from `cryptofeed`
|
|
||||||
option.log.filename = 'cryptofeed.log'
|
|
||||||
option.log.level = 'DEBUG'
|
|
||||||
option.log.disabled = true
|
|
||||||
# ------ deribit ------
|
|
||||||
|
|
||||||
|
|
||||||
[kraken]
|
[kraken]
|
||||||
key_descr = ''
|
key_descr = ''
|
||||||
api_key = ''
|
api_key = ''
|
||||||
secret = ''
|
secret = ''
|
||||||
# ------ kraken ------
|
|
||||||
|
|
||||||
|
|
||||||
[kucoin]
|
[kucoin]
|
||||||
key_id = ''
|
key_id = ''
|
||||||
key_secret = ''
|
key_secret = ''
|
||||||
key_passphrase = ''
|
key_passphrase = ''
|
||||||
# ------ kucoin ------
|
|
||||||
|
|
||||||
|
|
||||||
|
################
|
||||||
# -- BROKERZ ---
|
# -- BROKERZ ---
|
||||||
|
################
|
||||||
[questrade]
|
[questrade]
|
||||||
refresh_token = ''
|
refresh_token = ''
|
||||||
access_token = ''
|
access_token = ''
|
||||||
|
|
@ -54,55 +42,44 @@ api_server = 'https://api06.iq.questrade.com/'
|
||||||
expires_in = 1800
|
expires_in = 1800
|
||||||
token_type = 'Bearer'
|
token_type = 'Bearer'
|
||||||
expires_at = 1616095326.355846
|
expires_at = 1616095326.355846
|
||||||
# ------ questrade ------
|
|
||||||
|
|
||||||
|
|
||||||
[ib]
|
[ib]
|
||||||
# define the (set of) host-port socketaddrs that
|
|
||||||
# brokerd.ib will scan to connect to an API endpoint
|
|
||||||
# (ib-gw or ib-tws listening instances)
|
|
||||||
hosts = [
|
hosts = [
|
||||||
'127.0.0.1',
|
'127.0.0.1',
|
||||||
]
|
]
|
||||||
|
# XXX: the order in which ports will be scanned
|
||||||
|
# (by the `brokerd` daemon-actor)
|
||||||
|
# is determined # by the line order here.
|
||||||
|
# TODO: when we eventually spawn gateways in our
|
||||||
|
# container, we can just dynamically allocate these
|
||||||
|
# using IBC.
|
||||||
ports = [
|
ports = [
|
||||||
4002, # gw
|
4002, # gw
|
||||||
7497, # tws
|
7497, # tws
|
||||||
]
|
]
|
||||||
|
|
||||||
# When API endpoints are being scanned durin startup, the order
|
# XXX: for a paper account the flex web query service
|
||||||
# of user-defined-account "names" (as defined below) here
|
# is not supported so you have to manually download
|
||||||
# determines which py-client connection is given priority to be
|
# and XML report and put it in a location that can be
|
||||||
# used for data-feed-requests by according to whichever client
|
# accessed by the ``brokerd.ib`` backend code for parsing.
|
||||||
# connected to an API endpoing which reported the equivalent
|
flex_token = ''
|
||||||
# account number for that name.
|
flex_trades_query_id = '' # live account
|
||||||
|
|
||||||
|
# when clients are being scanned this determines
|
||||||
|
# which clients are preferred to be used for data
|
||||||
|
# feeds based on the order of account names, if
|
||||||
|
# detected as active on an API client.
|
||||||
prefer_data_account = [
|
prefer_data_account = [
|
||||||
'paper',
|
'paper',
|
||||||
'margin',
|
'margin',
|
||||||
'ira',
|
'ira',
|
||||||
]
|
]
|
||||||
|
|
||||||
# For long-term trades txn (transaction) history
|
|
||||||
# processing (i.e your txn ledger with IB) you can
|
|
||||||
# (automatically for live accounts) query the FLEX
|
|
||||||
# report system for past history.
|
|
||||||
#
|
|
||||||
# (For paper accounts the web query service
|
|
||||||
# is not supported so you have to manually download
|
|
||||||
# an XML report and put it in a location that can be
|
|
||||||
# accessed by our `brokerd.ib` backend code for parsing).
|
|
||||||
#
|
|
||||||
flex_token = ''
|
|
||||||
flex_trades_query_id = '' # live account
|
|
||||||
|
|
||||||
# define "aliases" (names) for each account number
|
|
||||||
# such that the names can be reffed and logged throughout
|
|
||||||
# `piker.accounting` subsys and more easily
|
|
||||||
# referred to by the user.
|
|
||||||
#
|
|
||||||
# These keys will be the set exposed through the order-mode
|
|
||||||
# account-selection UI so that numbers are never shown.
|
|
||||||
[ib.accounts]
|
[ib.accounts]
|
||||||
paper = 'DU0000000' # <- literal account #
|
# the order in which accounts will be selectable
|
||||||
margin = 'U0000000'
|
# in the order mode UI (if found via clients during
|
||||||
ira = 'U0000000'
|
# API-app scanning)when a new symbol is loaded.
|
||||||
# ------ ib ------
|
paper = 'XX0000000'
|
||||||
|
margin = 'X0000000'
|
||||||
|
ira = 'X0000000'
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
[network]
|
[network]
|
||||||
pikerd = [
|
tsdb.backend = 'marketstore'
|
||||||
'/ipv4/127.0.0.1/tcp/6116', # std localhost daemon-actor tree
|
tsdb.host = 'localhost'
|
||||||
# '/uds/6116', # TODO std uds socket file
|
tsdb.grpc_port = 5995
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
[ui]
|
[ui]
|
||||||
# set custom font + size which will scale entire UI
|
# set custom font + size which will scale entire UI
|
||||||
|
|
|
||||||
|
|
@ -1,138 +1,30 @@
|
||||||
running ``ib`` gateway in ``docker``
|
running ``ib`` gateway in ``docker``
|
||||||
------------------------------------
|
------------------------------------
|
||||||
We have a config based on a well maintained community
|
We have a config based on the (now defunct)
|
||||||
image from `@gnzsnz`:
|
image from "waytrade":
|
||||||
|
|
||||||
https://github.com/gnzsnz/ib-gateway-docker
|
https://github.com/waytrade/ib-gateway-docker
|
||||||
|
|
||||||
|
To startup this image with our custom settings
|
||||||
To startup this image simply run the command::
|
simply run the command::
|
||||||
|
|
||||||
docker compose up
|
docker compose up
|
||||||
|
|
||||||
(For further usage^ see the official `docker-compose`_ docs)
|
And you should have the following socket-available services:
|
||||||
|
|
||||||
|
- ``x11vnc1@127.0.0.1:3003``
|
||||||
|
- ``ib-gw@127.0.0.1:4002``
|
||||||
|
|
||||||
And you should have the following socket-available services by
|
You can attach to the container via a VNC client
|
||||||
default:
|
without password auth.
|
||||||
|
|
||||||
- ``x11vnc1 @ 127.0.0.1:5900``
|
SECURITY STUFF!?!?!
|
||||||
- ``ib-gw @ 127.0.0.1:4002``
|
-------------------
|
||||||
|
Though "``ib``" claims they host filter connections outside
|
||||||
You can now attach to the container via a VNC client with password-auth;
|
localhost (aka ``127.0.0.1``) it's probably better if you filter
|
||||||
here is an example using ``vncclient`` on ``linux``::
|
the socket at the OS level using a stateless firewall rule::
|
||||||
|
|
||||||
vncviewer localhost:5900
|
|
||||||
|
|
||||||
now enter the pw (password) you set via an (see second code blob)
|
|
||||||
`.env file`_ or pw-file according to the `credentials section`_.
|
|
||||||
|
|
||||||
If you want to change away from their default config see the example
|
|
||||||
`docker-compose.yml`-config issue and config-section of the readme,
|
|
||||||
|
|
||||||
- https://github.com/gnzsnz/ib-gateway-docker?tab=readme-ov-file#configuration
|
|
||||||
- https://github.com/gnzsnz/ib-gateway-docker/discussions/103
|
|
||||||
|
|
||||||
.. _.env file: https://github.com/gnzsnz/ib-gateway-docker?tab=readme-ov-file#how-to-use-it
|
|
||||||
.. _docker-compose: https://docs.docker.com/compose/
|
|
||||||
.. _credentials section: https://github.com/gnzsnz/ib-gateway-docker?tab=readme-ov-file#credentials
|
|
||||||
|
|
||||||
|
|
||||||
Connecting to the API from `piker`
|
|
||||||
---------------------------------
|
|
||||||
In order to expose the container's API endpoint to the
|
|
||||||
`brokerd/datad/ib` actor, we need to add a section to the user's
|
|
||||||
`brokers.toml` config (note the below is similar to the repo-shipped
|
|
||||||
template file),
|
|
||||||
|
|
||||||
.. code:: toml
|
|
||||||
|
|
||||||
[ib]
|
|
||||||
# define the (set of) host-port socketaddrs that
|
|
||||||
# brokerd.ib will scan to connect to an API endpoint
|
|
||||||
# (ib-gw or ib-tws listening instances)
|
|
||||||
hosts = [
|
|
||||||
'127.0.0.1',
|
|
||||||
]
|
|
||||||
ports = [
|
|
||||||
4002, # gw
|
|
||||||
7497, # tws
|
|
||||||
]
|
|
||||||
|
|
||||||
# When API endpoints are being scanned durin startup, the order
|
|
||||||
# of user-defined-account "names" (as defined below) here
|
|
||||||
# determines which py-client connection is given priority to be
|
|
||||||
# used for data-feed-requests by according to whichever client
|
|
||||||
# connected to an API endpoing which reported the equivalent
|
|
||||||
# account number for that name.
|
|
||||||
prefer_data_account = [
|
|
||||||
'paper',
|
|
||||||
'margin',
|
|
||||||
'ira',
|
|
||||||
]
|
|
||||||
|
|
||||||
# define "aliases" (names) for each account number
|
|
||||||
# such that the names can be reffed and logged throughout
|
|
||||||
# `piker.accounting` subsys and more easily
|
|
||||||
# referred to by the user.
|
|
||||||
#
|
|
||||||
# These keys will be the set exposed through the order-mode
|
|
||||||
# account-selection UI so that numbers are never shown.
|
|
||||||
[ib.accounts]
|
|
||||||
paper = 'XX0000000'
|
|
||||||
margin = 'X0000000'
|
|
||||||
ira = 'X0000000'
|
|
||||||
|
|
||||||
|
|
||||||
the broker daemon can also connect to the container's VNC server for
|
|
||||||
added functionalies including,
|
|
||||||
|
|
||||||
- viewing the API endpoint program's GUI for manual interventions,
|
|
||||||
- workarounds for historical data throttling using hotkey hacks,
|
|
||||||
|
|
||||||
Add a further section to `brokers.toml` which maps each API-ep's
|
|
||||||
port to a table of VNC server connection info like,
|
|
||||||
|
|
||||||
.. code:: toml
|
|
||||||
|
|
||||||
[ib.vnc_addrs]
|
|
||||||
4002 = {host = 'localhost', port = 5900, pw = 'doggy'}
|
|
||||||
|
|
||||||
The `pw = 'doggy'` here ^ should the same value as the particular
|
|
||||||
container instances `.env` file setting (when it was run),
|
|
||||||
|
|
||||||
.. code:: ini
|
|
||||||
|
|
||||||
VNC_SERVER_PASSWORD='doggy'
|
|
||||||
|
|
||||||
|
|
||||||
IF you also want to run ``TWS``
|
|
||||||
-------------------------------
|
|
||||||
You can also run it containerized,
|
|
||||||
|
|
||||||
https://github.com/gnzsnz/ib-gateway-docker?tab=readme-ov-file#using-tws
|
|
||||||
|
|
||||||
|
|
||||||
SECURITY stuff (advanced, only if you're paranoid)
|
|
||||||
--------------------------------------------------
|
|
||||||
First and foremost if doing a "distributed" container setup where you
|
|
||||||
run the ``ib-gw`` docker container and your connecting API client
|
|
||||||
(likely ``ib_async`` from python) on **different hosts** be sure to
|
|
||||||
read the `security considerations`_ section!
|
|
||||||
|
|
||||||
And for a further (somewhat paranoid) perspective from
|
|
||||||
a long-time-ago serious devops eng..
|
|
||||||
|
|
||||||
Though "``ib``" claims they filter remote host connections outside
|
|
||||||
``localhost`` (aka ``127.0.0.1`` on ipv4) it's prolly justified if
|
|
||||||
you'd like to filter the socket at the *OS level* using a stateless
|
|
||||||
firewall rule::
|
|
||||||
|
|
||||||
ip rule add not unicast iif lo to 0.0.0.0/0 dport 4002
|
ip rule add not unicast iif lo to 0.0.0.0/0 dport 4002
|
||||||
|
|
||||||
|
We will soon have this baked into our own custom image but for
|
||||||
We will soon have this either baked into our own custom derivative
|
now you'll have to do it urself dawgy.
|
||||||
image (or patched into the current upstream one after further testin)
|
|
||||||
but for now you'll have to do it urself, diggity dawg.
|
|
||||||
|
|
||||||
.. _security considerations: https://github.com/gnzsnz/ib-gateway-docker?tab=readme-ov-file#security-considerations
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,10 @@
|
||||||
# a community maintained IB API container!
|
# rework from the original @
|
||||||
#
|
# https://github.com/waytrade/ib-gateway-docker/blob/master/docker-compose.yml
|
||||||
# https://github.com/gnzsnz/ib-gateway-docker
|
version: "3.5"
|
||||||
#
|
|
||||||
# For piker we (currently) include some minor deviations
|
|
||||||
# for some config files in the `volumes` section.
|
|
||||||
#
|
|
||||||
# See full configuration settings @
|
|
||||||
# - https://github.com/gnzsnz/ib-gateway-docker?tab=readme-ov-file#configuration
|
|
||||||
# - https://github.com/gnzsnz/ib-gateway-docker/discussions/103
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
ib_gw_paper:
|
ib_gw_paper:
|
||||||
|
|
||||||
# apparently java is a mega cukc:
|
# apparently java is a mega cukc:
|
||||||
|
|
@ -55,22 +50,16 @@ services:
|
||||||
target: /root/scripts/run_x11_vnc.sh
|
target: /root/scripts/run_x11_vnc.sh
|
||||||
read_only: true
|
read_only: true
|
||||||
|
|
||||||
# NOTE: an alt method to fill these out is to
|
# NOTE:to fill these out, define an `.env` file in the same dir as
|
||||||
# define an `.env` file in the same dir as
|
# this compose file which looks something like:
|
||||||
# this compose file.
|
# TWS_USERID='myuser'
|
||||||
|
# TWS_PASSWORD='guest'
|
||||||
environment:
|
environment:
|
||||||
TWS_USERID: ${TWS_USERID}
|
TWS_USERID: ${TWS_USERID}
|
||||||
# TWS_USERID: 'myuser'
|
|
||||||
TWS_PASSWORD: ${TWS_PASSWORD}
|
TWS_PASSWORD: ${TWS_PASSWORD}
|
||||||
# TWS_PASSWORD: 'guest'
|
TRADING_MODE: 'paper'
|
||||||
TRADING_MODE: ${TRADING_MODE}
|
VNC_SERVER_PASSWORD: 'doggy'
|
||||||
# TRADING_MODE: 'paper'
|
VNC_SERVER_PORT: '3003'
|
||||||
VNC_SERVER_PASSWORD: ${VNC_SERVER_PASSWORD}
|
|
||||||
# VNC_SERVER_PASSWORD: 'doggy'
|
|
||||||
|
|
||||||
# TODO, see if we can get this supported like it
|
|
||||||
# was on the old `waytrade` image?
|
|
||||||
# VNC_SERVER_PORT: '3003'
|
|
||||||
|
|
||||||
# ports:
|
# ports:
|
||||||
# - target: 4002
|
# - target: 4002
|
||||||
|
|
@ -87,9 +76,6 @@ services:
|
||||||
# - "127.0.0.1:4002:4002"
|
# - "127.0.0.1:4002:4002"
|
||||||
# - "127.0.0.1:5900:5900"
|
# - "127.0.0.1:5900:5900"
|
||||||
|
|
||||||
# TODO, a masked but working example of dual paper + live
|
|
||||||
# ib-gw instances running in a single app run!
|
|
||||||
#
|
|
||||||
# ib_gw_live:
|
# ib_gw_live:
|
||||||
# image: waytrade/ib-gateway:1012.2i
|
# image: waytrade/ib-gateway:1012.2i
|
||||||
# restart: no
|
# restart: no
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ from ._pos import (
|
||||||
Account,
|
Account,
|
||||||
load_account,
|
load_account,
|
||||||
load_account_from_ledger,
|
load_account_from_ledger,
|
||||||
|
open_pps,
|
||||||
open_account,
|
open_account,
|
||||||
Position,
|
Position,
|
||||||
)
|
)
|
||||||
|
|
@ -67,6 +68,7 @@ __all__ = [
|
||||||
'load_account_from_ledger',
|
'load_account_from_ledger',
|
||||||
'mk_allocator',
|
'mk_allocator',
|
||||||
'open_account',
|
'open_account',
|
||||||
|
'open_pps',
|
||||||
'open_trade_ledger',
|
'open_trade_ledger',
|
||||||
'unpack_fqme',
|
'unpack_fqme',
|
||||||
'DerivTypes',
|
'DerivTypes',
|
||||||
|
|
|
||||||
|
|
@ -356,12 +356,13 @@ class Position(Struct):
|
||||||
) -> bool:
|
) -> bool:
|
||||||
'''
|
'''
|
||||||
Update clearing table by calculating the rolling ppu and
|
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.
|
Inserts are always done in datetime sorted order.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
|
# added: bool = False
|
||||||
tid: str = t.tid
|
tid: str = t.tid
|
||||||
if tid in self._events:
|
if tid in self._events:
|
||||||
log.debug(
|
log.debug(
|
||||||
|
|
@ -369,7 +370,7 @@ class Position(Struct):
|
||||||
f'\n'
|
f'\n'
|
||||||
f'{t}\n'
|
f'{t}\n'
|
||||||
)
|
)
|
||||||
return False
|
# return added
|
||||||
|
|
||||||
# TODO: apparently this IS possible with a dict but not
|
# TODO: apparently this IS possible with a dict but not
|
||||||
# common and probably not that beneficial unless we're also
|
# common and probably not that beneficial unless we're also
|
||||||
|
|
@ -450,12 +451,6 @@ class Position(Struct):
|
||||||
# def suggest_split(self) -> float:
|
# 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):
|
class Account(Struct):
|
||||||
'''
|
'''
|
||||||
|
|
@ -499,9 +494,9 @@ class Account(Struct):
|
||||||
|
|
||||||
def update_from_ledger(
|
def update_from_ledger(
|
||||||
self,
|
self,
|
||||||
ledger: TransactionLedger|dict[str, Transaction],
|
ledger: TransactionLedger | dict[str, Transaction],
|
||||||
cost_scalar: float = 2,
|
cost_scalar: float = 2,
|
||||||
symcache: SymbologyCache|None = None,
|
symcache: SymbologyCache | None = None,
|
||||||
|
|
||||||
_mktmap_table: dict[str, MktPair] | None = None,
|
_mktmap_table: dict[str, MktPair] | None = None,
|
||||||
|
|
||||||
|
|
@ -754,7 +749,7 @@ class Account(Struct):
|
||||||
# XXX WTF: if we use a tomlkit.Integer here we get this
|
# XXX WTF: if we use a tomlkit.Integer here we get this
|
||||||
# super weird --1 thing going on for cumsize!?1!
|
# super weird --1 thing going on for cumsize!?1!
|
||||||
# NOTE: the fix was to always float() the size value loaded
|
# NOTE: the fix was to always float() the size value loaded
|
||||||
# in open_account() below!
|
# in open_pps() below!
|
||||||
config.write(
|
config.write(
|
||||||
config=self.conf,
|
config=self.conf,
|
||||||
path=self.conf_path,
|
path=self.conf_path,
|
||||||
|
|
@ -938,6 +933,7 @@ def open_account(
|
||||||
clears_table['dt'] = dt
|
clears_table['dt'] = dt
|
||||||
trans.append(Transaction(
|
trans.append(Transaction(
|
||||||
fqme=bs_mktid,
|
fqme=bs_mktid,
|
||||||
|
# sym=mkt,
|
||||||
bs_mktid=bs_mktid,
|
bs_mktid=bs_mktid,
|
||||||
tid=tid,
|
tid=tid,
|
||||||
# XXX: not sure why sometimes these are loaded as
|
# XXX: not sure why sometimes these are loaded as
|
||||||
|
|
@ -960,22 +956,11 @@ def open_account(
|
||||||
):
|
):
|
||||||
expiry: pendulum.DateTime = pendulum.parse(expiry)
|
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
|
# XXX: super critical, we need to be sure to include
|
||||||
# all pps.toml clears to avoid reusing clears that were
|
# all pps.toml clears to avoid reusing clears that were
|
||||||
|
|
@ -983,13 +968,8 @@ def open_account(
|
||||||
# state, since today's records may have already been
|
# state, since today's records may have already been
|
||||||
# processed!
|
# processed!
|
||||||
for t in trans:
|
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:
|
try:
|
||||||
yield acnt
|
yield acnt
|
||||||
finally:
|
finally:
|
||||||
|
|
@ -997,6 +977,20 @@ def open_account(
|
||||||
acnt.write_config()
|
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(
|
def load_account_from_ledger(
|
||||||
|
|
||||||
brokername: str,
|
brokername: str,
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ from typing import (
|
||||||
TYPE_CHECKING,
|
TYPE_CHECKING,
|
||||||
)
|
)
|
||||||
|
|
||||||
from tractor.devx import maybe_open_crash_handler
|
|
||||||
import polars as pl
|
import polars as pl
|
||||||
from pendulum import (
|
from pendulum import (
|
||||||
DateTime,
|
DateTime,
|
||||||
|
|
@ -294,11 +293,7 @@ def iter_by_dt(
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# XXX: we should never really get here bc it means some kinda
|
# XXX: should never get here..
|
||||||
# bad txn-record (field) data..
|
|
||||||
#
|
|
||||||
# -> set the `debug_mode = True` if you want to trace such
|
|
||||||
# cases from REPL ;)
|
|
||||||
else:
|
else:
|
||||||
# XXX: we should really never get here..
|
# XXX: we should really never get here..
|
||||||
# only if a ledger record has no expected sort(able)
|
# only if a ledger record has no expected sort(able)
|
||||||
|
|
@ -308,21 +303,16 @@ def iter_by_dt(
|
||||||
'No (time) sortable field for TXN:\n'
|
'No (time) sortable field for TXN:\n'
|
||||||
f'{tx!r}\n'
|
f'{tx!r}\n'
|
||||||
)
|
)
|
||||||
report: str = (
|
|
||||||
f'No supported time-field found in txn !?\n'
|
|
||||||
f'\n'
|
|
||||||
f'supported-time-fields: {parsers!r}\n'
|
|
||||||
f'\n'
|
|
||||||
f'txn: {tx!r}\n'
|
|
||||||
)
|
|
||||||
if debug:
|
if debug:
|
||||||
with maybe_open_crash_handler(
|
import tractor
|
||||||
pdb=debug,
|
with tractor.devx.maybe_open_crash_handler():
|
||||||
raise_on_exit=False,
|
raise ValueError(
|
||||||
):
|
f'No supported time-field found in txn !?\n'
|
||||||
raise ValueError(report)
|
f'\n'
|
||||||
else:
|
f'supported-time-fields: {parsers!r}\n'
|
||||||
log.error(report)
|
f'\n'
|
||||||
|
f'txn: {tx!r}\n'
|
||||||
|
)
|
||||||
|
|
||||||
if _invalid is not None:
|
if _invalid is not None:
|
||||||
_invalid.append(tx)
|
_invalid.append(tx)
|
||||||
|
|
@ -406,7 +396,6 @@ def open_ledger_dfs(
|
||||||
acctname: str,
|
acctname: str,
|
||||||
|
|
||||||
ledger: TransactionLedger | None = None,
|
ledger: TransactionLedger | None = None,
|
||||||
debug_mode: bool = False,
|
|
||||||
|
|
||||||
**kwargs,
|
**kwargs,
|
||||||
|
|
||||||
|
|
@ -421,10 +410,8 @@ def open_ledger_dfs(
|
||||||
can update the ledger on exit.
|
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:
|
if not ledger:
|
||||||
import time
|
import time
|
||||||
from ._ledger import open_trade_ledger
|
from ._ledger import open_trade_ledger
|
||||||
|
|
@ -516,7 +503,7 @@ def ledger_to_dfs(
|
||||||
|
|
||||||
df = dfs[key] = ldf.with_columns([
|
df = dfs[key] = ldf.with_columns([
|
||||||
|
|
||||||
pl.cum_sum('size').alias('cumsize'),
|
pl.cumsum('size').alias('cumsize'),
|
||||||
|
|
||||||
# amount of source asset "sent" (via buy txns in
|
# amount of source asset "sent" (via buy txns in
|
||||||
# the market) to acquire the dst asset, PER txn.
|
# the market) to acquire the dst asset, PER txn.
|
||||||
|
|
@ -531,7 +518,7 @@ def ledger_to_dfs(
|
||||||
]).with_columns([
|
]).with_columns([
|
||||||
|
|
||||||
# rolling balance in src asset units
|
# rolling balance in src asset units
|
||||||
(pl.col('dst_bot').cum_sum() * -1).alias('src_balance'),
|
(pl.col('dst_bot').cumsum() * -1).alias('src_balance'),
|
||||||
|
|
||||||
# "position operation type" in terms of increasing the
|
# "position operation type" in terms of increasing the
|
||||||
# amount in the dst asset (entering) or decreasing the
|
# amount in the dst asset (entering) or decreasing the
|
||||||
|
|
@ -673,7 +660,7 @@ def ledger_to_dfs(
|
||||||
# cost that was included in the least-recently
|
# cost that was included in the least-recently
|
||||||
# entered txn that is still part of the current CSi
|
# entered txn that is still part of the current CSi
|
||||||
# set.
|
# set.
|
||||||
# => we look up the cost-per-unit cum_sum and apply
|
# => we look up the cost-per-unit cumsum and apply
|
||||||
# if over the current txn size (by multiplication)
|
# if over the current txn size (by multiplication)
|
||||||
# and then reverse that previusly applied cost on
|
# and then reverse that previusly applied cost on
|
||||||
# the txn_cost for this record.
|
# the txn_cost for this record.
|
||||||
|
|
|
||||||
|
|
@ -94,15 +94,13 @@ class L1(Struct):
|
||||||
|
|
||||||
|
|
||||||
# validation type
|
# validation type
|
||||||
# https://developers.binance.com/docs/derivatives/usds-margined-futures/websocket-market-streams/Aggregate-Trade-Streams#response-example
|
|
||||||
class AggTrade(Struct, frozen=True):
|
class AggTrade(Struct, frozen=True):
|
||||||
e: str # Event type
|
e: str # Event type
|
||||||
E: int # Event time
|
E: int # Event time
|
||||||
s: str # Symbol
|
s: str # Symbol
|
||||||
a: int # Aggregate trade ID
|
a: int # Aggregate trade ID
|
||||||
p: float # Price
|
p: float # Price
|
||||||
q: float # Quantity with all the market trades
|
q: float # Quantity
|
||||||
nq: float # Normal quantity without the trades involving RPI orders
|
|
||||||
f: int # First trade ID
|
f: int # First trade ID
|
||||||
l: int # noqa Last trade ID
|
l: int # noqa Last trade ID
|
||||||
T: int # Trade time
|
T: int # Trade time
|
||||||
|
|
@ -450,6 +448,7 @@ async def subscribe(
|
||||||
|
|
||||||
|
|
||||||
async def stream_quotes(
|
async def stream_quotes(
|
||||||
|
|
||||||
send_chan: trio.abc.SendChannel,
|
send_chan: trio.abc.SendChannel,
|
||||||
symbols: list[str],
|
symbols: list[str],
|
||||||
feed_is_live: trio.Event,
|
feed_is_live: trio.Event,
|
||||||
|
|
@ -461,7 +460,6 @@ async def stream_quotes(
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
||||||
async with (
|
async with (
|
||||||
tractor.trionics.maybe_raise_from_masking_exc(),
|
|
||||||
send_chan as send_chan,
|
send_chan as send_chan,
|
||||||
open_cached_client('binance') as client,
|
open_cached_client('binance') as client,
|
||||||
):
|
):
|
||||||
|
|
|
||||||
|
|
@ -102,10 +102,7 @@ class Pair(Struct, frozen=True, kw_only=True):
|
||||||
# https://developers.binance.com/docs/binance-spot-api-docs#2025-08-26
|
# https://developers.binance.com/docs/binance-spot-api-docs#2025-08-26
|
||||||
# will become non-optional 2025-08-28?
|
# will become non-optional 2025-08-28?
|
||||||
# https://developers.binance.com/docs/binance-spot-api-docs#future-changes
|
# https://developers.binance.com/docs/binance-spot-api-docs#future-changes
|
||||||
pegInstructionsAllowed: bool = False
|
pegInstructionsAllowed: bool|None = None
|
||||||
|
|
||||||
# https://developers.binance.com/docs/binance-spot-api-docs#2025-12-02
|
|
||||||
opoAllowed: bool = False
|
|
||||||
|
|
||||||
filters: dict[
|
filters: dict[
|
||||||
str,
|
str,
|
||||||
|
|
@ -223,10 +220,7 @@ class FutesPair(Pair):
|
||||||
assert pair == self.pair # sanity
|
assert pair == self.pair # sanity
|
||||||
return f'{expiry}'
|
return f'{expiry}'
|
||||||
|
|
||||||
case (
|
case 'PERPETUAL':
|
||||||
'PERPETUAL'
|
|
||||||
| 'TRADIFI_PERPETUAL'
|
|
||||||
):
|
|
||||||
return 'PERP'
|
return 'PERP'
|
||||||
|
|
||||||
case '':
|
case '':
|
||||||
|
|
@ -255,10 +249,7 @@ class FutesPair(Pair):
|
||||||
margin: str = self.marginAsset
|
margin: str = self.marginAsset
|
||||||
|
|
||||||
match ctype:
|
match ctype:
|
||||||
case (
|
case 'PERPETUAL':
|
||||||
'PERPETUAL'
|
|
||||||
| 'TRADIFI_PERPETUAL'
|
|
||||||
):
|
|
||||||
return f'{margin}M'
|
return f'{margin}M'
|
||||||
|
|
||||||
case (
|
case (
|
||||||
|
|
|
||||||
|
|
@ -20,11 +20,6 @@ runnable script-programs.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
from datetime import ( # noqa
|
|
||||||
datetime,
|
|
||||||
date,
|
|
||||||
tzinfo as TzInfo,
|
|
||||||
)
|
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from typing import (
|
from typing import (
|
||||||
Literal,
|
Literal,
|
||||||
|
|
@ -38,6 +33,7 @@ from piker.brokers._util import get_logger
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from .api import Client
|
from .api import Client
|
||||||
|
from ib_insync import IB
|
||||||
import i3ipc
|
import i3ipc
|
||||||
|
|
||||||
log = get_logger('piker.brokers.ib')
|
log = get_logger('piker.brokers.ib')
|
||||||
|
|
@ -61,7 +57,7 @@ no_setup_msg:str = (
|
||||||
|
|
||||||
|
|
||||||
def try_xdo_manual(
|
def try_xdo_manual(
|
||||||
client: Client,
|
vnc_sockaddr: str,
|
||||||
):
|
):
|
||||||
'''
|
'''
|
||||||
Do the "manual" `xdo`-based screen switch + click
|
Do the "manual" `xdo`-based screen switch + click
|
||||||
|
|
@ -78,14 +74,14 @@ def try_xdo_manual(
|
||||||
_reset_tech = 'i3ipc_xdotool'
|
_reset_tech = 'i3ipc_xdotool'
|
||||||
return True
|
return True
|
||||||
except OSError:
|
except OSError:
|
||||||
vnc_sockaddr: str = client.conf.vnc_addrs
|
|
||||||
log.exception(
|
log.exception(
|
||||||
no_setup_msg.format(vnc_sockaddr=vnc_sockaddr)
|
no_setup_msg.format(vnc_sockaddr)
|
||||||
)
|
)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
async def data_reset_hack(
|
async def data_reset_hack(
|
||||||
|
# vnc_host: str,
|
||||||
client: Client,
|
client: Client,
|
||||||
reset_type: Literal['data', 'connection'],
|
reset_type: Literal['data', 'connection'],
|
||||||
|
|
||||||
|
|
@ -117,24 +113,36 @@ async def data_reset_hack(
|
||||||
that need to be wrangle.
|
that need to be wrangle.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
|
ib_client: IB = client.ib
|
||||||
|
|
||||||
# look up any user defined vnc socket address mapped from
|
# look up any user defined vnc socket address mapped from
|
||||||
# a particular API socket port.
|
# a particular API socket port.
|
||||||
vnc_addrs: tuple[str]|None = client.conf.get('vnc_addrs')
|
api_port: str = str(ib_client.client.port)
|
||||||
if not vnc_addrs:
|
vnc_host: str
|
||||||
|
vnc_port: int
|
||||||
|
vnc_sockaddr: tuple[str] | None = client.conf.get('vnc_addrs')
|
||||||
|
|
||||||
|
if not vnc_sockaddr:
|
||||||
log.warning(
|
log.warning(
|
||||||
no_setup_msg.format(vnc_sockaddr=client.conf)
|
no_setup_msg.format(vnc_sockaddr)
|
||||||
+
|
+
|
||||||
'REQUIRES A `vnc_addrs: array` ENTRY'
|
'REQUIRES A `vnc_addrs: array` ENTRY'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
vnc_host, vnc_port = vnc_sockaddr.get(
|
||||||
|
api_port,
|
||||||
|
('localhost', 3003)
|
||||||
|
)
|
||||||
global _reset_tech
|
global _reset_tech
|
||||||
|
|
||||||
match _reset_tech:
|
match _reset_tech:
|
||||||
case 'vnc':
|
case 'vnc':
|
||||||
try:
|
try:
|
||||||
await tractor.to_asyncio.run_task(
|
await tractor.to_asyncio.run_task(
|
||||||
partial(
|
partial(
|
||||||
vnc_click_hack,
|
vnc_click_hack,
|
||||||
client=client,
|
host=vnc_host,
|
||||||
|
port=vnc_port,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
except (
|
except (
|
||||||
|
|
@ -145,31 +153,29 @@ async def data_reset_hack(
|
||||||
import i3ipc # noqa (since a deps dynamic check)
|
import i3ipc # noqa (since a deps dynamic check)
|
||||||
except ModuleNotFoundError:
|
except ModuleNotFoundError:
|
||||||
log.warning(
|
log.warning(
|
||||||
no_setup_msg.format(vnc_sockaddr=client.conf)
|
no_setup_msg.format(vnc_sockaddr)
|
||||||
)
|
)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# XXX, Xorg only workaround..
|
if vnc_host not in {
|
||||||
# TODO? remove now that we have `pyvnc`?
|
'localhost',
|
||||||
# if vnc_host not in {
|
'127.0.0.1',
|
||||||
# 'localhost',
|
}:
|
||||||
# '127.0.0.1',
|
focussed, matches = i3ipc_fin_wins_titled()
|
||||||
# }:
|
if not matches:
|
||||||
# focussed, matches = i3ipc_fin_wins_titled()
|
log.warning(
|
||||||
# if not matches:
|
no_setup_msg.format(vnc_sockaddr)
|
||||||
# log.warning(
|
)
|
||||||
# no_setup_msg.format(vnc_sockaddr=vnc_sockaddr)
|
return False
|
||||||
# )
|
else:
|
||||||
# return False
|
try_xdo_manual(vnc_sockaddr)
|
||||||
# else:
|
|
||||||
# try_xdo_manual(vnc_sockaddr)
|
|
||||||
|
|
||||||
# localhost but no vnc-client or it borked..
|
# localhost but no vnc-client or it borked..
|
||||||
else:
|
else:
|
||||||
try_xdo_manual(client)
|
try_xdo_manual(vnc_sockaddr)
|
||||||
|
|
||||||
case 'i3ipc_xdotool':
|
case 'i3ipc_xdotool':
|
||||||
try_xdo_manual(client)
|
try_xdo_manual(vnc_sockaddr)
|
||||||
# i3ipc_xdotool_manual_click_hack()
|
# i3ipc_xdotool_manual_click_hack()
|
||||||
|
|
||||||
case _ as tech:
|
case _ as tech:
|
||||||
|
|
@ -180,66 +186,21 @@ async def data_reset_hack(
|
||||||
|
|
||||||
|
|
||||||
async def vnc_click_hack(
|
async def vnc_click_hack(
|
||||||
client: Client,
|
host: str,
|
||||||
reset_type: str = 'data',
|
port: int,
|
||||||
pw: str|None = None,
|
reset_type: str = 'data'
|
||||||
|
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Reset the data or network connection for the VNC attached
|
Reset the data or network connection for the VNC attached
|
||||||
ib-gateway using a (magic) keybinding combo.
|
ib gateway using magic combos.
|
||||||
|
|
||||||
A vnc-server password can be set either by an input `pw` param or
|
|
||||||
set in the client's config with the latter loaded from the user's
|
|
||||||
`brokers.toml` in a vnc-addrs-port-mapping section,
|
|
||||||
|
|
||||||
.. code:: toml
|
|
||||||
|
|
||||||
[ib.vnc_addrs]
|
|
||||||
4002 = {host = 'localhost', port = 5900, pw = 'doggy'}
|
|
||||||
|
|
||||||
'''
|
'''
|
||||||
api_port: str = str(client.ib.client.port)
|
|
||||||
conf: dict = client.conf
|
|
||||||
vnc_addrs: dict[int, tuple] = conf.get('vnc_addrs')
|
|
||||||
if not vnc_addrs:
|
|
||||||
return None
|
|
||||||
|
|
||||||
addr_entry: dict|tuple = vnc_addrs.get(
|
|
||||||
api_port,
|
|
||||||
('localhost', 5900) # a typical default
|
|
||||||
)
|
|
||||||
if pw is None:
|
|
||||||
match addr_entry:
|
|
||||||
case (
|
|
||||||
host,
|
|
||||||
port,
|
|
||||||
):
|
|
||||||
pass
|
|
||||||
|
|
||||||
case {
|
|
||||||
'host': host,
|
|
||||||
'port': port,
|
|
||||||
'pw': pw
|
|
||||||
}:
|
|
||||||
pass
|
|
||||||
|
|
||||||
case _:
|
|
||||||
raise ValueError(
|
|
||||||
f'Invalid `ib.vnc_addrs` entry ?\n'
|
|
||||||
f'{addr_entry!r}\n'
|
|
||||||
)
|
|
||||||
try:
|
try:
|
||||||
from pyvnc import (
|
import asyncvnc
|
||||||
AsyncVNCClient,
|
|
||||||
VNCConfig,
|
|
||||||
Point,
|
|
||||||
MOUSE_BUTTON_LEFT,
|
|
||||||
)
|
|
||||||
except ModuleNotFoundError:
|
except ModuleNotFoundError:
|
||||||
log.warning(
|
log.warning(
|
||||||
"In order to leverage `piker`'s built-in data reset hacks, install "
|
"In order to leverage `piker`'s built-in data reset hacks, install "
|
||||||
"the `pyvnc` project: https://github.com/regulad/pyvnc.git"
|
"the `asyncvnc` project: https://github.com/barneygale/asyncvnc"
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
@ -250,27 +211,24 @@ async def vnc_click_hack(
|
||||||
'connection': 'r'
|
'connection': 'r'
|
||||||
}[reset_type]
|
}[reset_type]
|
||||||
|
|
||||||
with tractor.devx.open_crash_handler():
|
async with asyncvnc.connect(
|
||||||
client = await AsyncVNCClient.connect(
|
host,
|
||||||
VNCConfig(
|
port=port,
|
||||||
host=host,
|
|
||||||
port=port,
|
# TODO: doesn't work?
|
||||||
password=pw,
|
# see, https://github.com/barneygale/asyncvnc/issues/7
|
||||||
)
|
password='doggy',
|
||||||
|
|
||||||
|
) as client:
|
||||||
|
|
||||||
|
# move to middle of screen
|
||||||
|
# 640x1800
|
||||||
|
client.mouse.move(
|
||||||
|
x=500,
|
||||||
|
y=500,
|
||||||
)
|
)
|
||||||
async with client:
|
client.mouse.click()
|
||||||
# move to middle of screen
|
client.keyboard.press('Ctrl', 'Alt', key) # keys are stacked
|
||||||
# 640x1800
|
|
||||||
await client.move(
|
|
||||||
Point(
|
|
||||||
500,
|
|
||||||
500,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
# ensure the ib-gw window is active
|
|
||||||
await client.click(MOUSE_BUTTON_LEFT)
|
|
||||||
# send the hotkeys combo B)
|
|
||||||
await client.press('Ctrl', 'Alt', key) # keys are stacked
|
|
||||||
|
|
||||||
|
|
||||||
def i3ipc_fin_wins_titled(
|
def i3ipc_fin_wins_titled(
|
||||||
|
|
@ -379,99 +337,3 @@ def i3ipc_xdotool_manual_click_hack() -> None:
|
||||||
])
|
])
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
log.exception('xdotool timed out?')
|
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
|
|
||||||
# )
|
|
||||||
|
|
|
||||||
|
|
@ -334,15 +334,15 @@ class Client:
|
||||||
fqme: str,
|
fqme: str,
|
||||||
|
|
||||||
# EST in ISO 8601 format is required... below is EPOCH
|
# EST in ISO 8601 format is required... below is EPOCH
|
||||||
start_dt: datetime|str = "1970-01-01T00:00:00.000000-05:00",
|
start_dt: datetime | str = "1970-01-01T00:00:00.000000-05:00",
|
||||||
end_dt: datetime|str = "",
|
end_dt: datetime | str = "",
|
||||||
|
|
||||||
# ohlc sample period in seconds
|
# ohlc sample period in seconds
|
||||||
sample_period_s: int = 1,
|
sample_period_s: int = 1,
|
||||||
|
|
||||||
# optional "duration of time" equal to the
|
# optional "duration of time" equal to the
|
||||||
# length of the returned history frame.
|
# length of the returned history frame.
|
||||||
duration: str|None = None,
|
duration: str | None = None,
|
||||||
|
|
||||||
**kwargs,
|
**kwargs,
|
||||||
|
|
||||||
|
|
@ -716,8 +716,8 @@ class Client:
|
||||||
|
|
||||||
async def find_contracts(
|
async def find_contracts(
|
||||||
self,
|
self,
|
||||||
pattern: str|None = None,
|
pattern: str | None = None,
|
||||||
contract: Contract|None = None,
|
contract: Contract | None = None,
|
||||||
qualify: bool = True,
|
qualify: bool = True,
|
||||||
err_on_qualify: bool = True,
|
err_on_qualify: bool = True,
|
||||||
|
|
||||||
|
|
@ -862,7 +862,7 @@ class Client:
|
||||||
self,
|
self,
|
||||||
fqme: str,
|
fqme: str,
|
||||||
|
|
||||||
) -> datetime|None:
|
) -> datetime | None:
|
||||||
'''
|
'''
|
||||||
Return the first datetime stamp for `fqme` or `None`
|
Return the first datetime stamp for `fqme` or `None`
|
||||||
on request failure.
|
on request failure.
|
||||||
|
|
@ -918,7 +918,7 @@ class Client:
|
||||||
tries: int = 100,
|
tries: int = 100,
|
||||||
raise_on_timeout: bool = False,
|
raise_on_timeout: bool = False,
|
||||||
|
|
||||||
) -> Ticker|None:
|
) -> Ticker | None:
|
||||||
'''
|
'''
|
||||||
Return a single (snap) quote for symbol.
|
Return a single (snap) quote for symbol.
|
||||||
|
|
||||||
|
|
@ -930,7 +930,7 @@ class Client:
|
||||||
ready: ticker.TickerUpdateEvent = ticker.updateEvent
|
ready: ticker.TickerUpdateEvent = ticker.updateEvent
|
||||||
|
|
||||||
# ensure a last price gets filled in before we deliver quote
|
# ensure a last price gets filled in before we deliver quote
|
||||||
timeouterr: Exception|None = None
|
timeouterr: Exception | None = None
|
||||||
warnset: bool = False
|
warnset: bool = False
|
||||||
for _ in range(tries):
|
for _ in range(tries):
|
||||||
|
|
||||||
|
|
@ -944,7 +944,6 @@ class Client:
|
||||||
)
|
)
|
||||||
if tkr:
|
if tkr:
|
||||||
break
|
break
|
||||||
|
|
||||||
except TimeoutError as err:
|
except TimeoutError as err:
|
||||||
timeouterr = err
|
timeouterr = err
|
||||||
await asyncio.sleep(0.01)
|
await asyncio.sleep(0.01)
|
||||||
|
|
@ -953,9 +952,7 @@ class Client:
|
||||||
else:
|
else:
|
||||||
if not warnset:
|
if not warnset:
|
||||||
log.warning(
|
log.warning(
|
||||||
f'Quote req timed out..\n'
|
f'Quote req timed out..maybe venue is closed?\n'
|
||||||
f'Maybe the venue is closed?\n'
|
|
||||||
f'\n'
|
|
||||||
f'{asdict(contract)}'
|
f'{asdict(contract)}'
|
||||||
)
|
)
|
||||||
warnset = True
|
warnset = True
|
||||||
|
|
@ -967,11 +964,9 @@ class Client:
|
||||||
)
|
)
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
if (
|
if timeouterr and raise_on_timeout:
|
||||||
timeouterr
|
import pdbp
|
||||||
and
|
pdbp.set_trace()
|
||||||
raise_on_timeout
|
|
||||||
):
|
|
||||||
raise timeouterr
|
raise timeouterr
|
||||||
|
|
||||||
if not warnset:
|
if not warnset:
|
||||||
|
|
@ -1368,7 +1363,9 @@ async def load_aio_clients(
|
||||||
|
|
||||||
|
|
||||||
async def load_clients_for_trio(
|
async def load_clients_for_trio(
|
||||||
chan: tractor.to_asyncio.LinkedTaskChannel,
|
from_trio: asyncio.Queue,
|
||||||
|
to_trio: trio.abc.SendChannel,
|
||||||
|
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Pure async mngr proxy to ``load_aio_clients()``.
|
Pure async mngr proxy to ``load_aio_clients()``.
|
||||||
|
|
@ -1381,7 +1378,8 @@ async def load_clients_for_trio(
|
||||||
disconnect_on_exit=False,
|
disconnect_on_exit=False,
|
||||||
) as accts2clients:
|
) as accts2clients:
|
||||||
|
|
||||||
chan.started_nowait(accts2clients)
|
to_trio.send_nowait(accts2clients)
|
||||||
|
|
||||||
# TODO: maybe a sync event to wait on instead?
|
# TODO: maybe a sync event to wait on instead?
|
||||||
await asyncio.sleep(float('inf'))
|
await asyncio.sleep(float('inf'))
|
||||||
|
|
||||||
|
|
@ -1507,7 +1505,7 @@ class MethodProxy:
|
||||||
self,
|
self,
|
||||||
pattern: str,
|
pattern: str,
|
||||||
|
|
||||||
) -> dict[str, Any]|trio.Event:
|
) -> dict[str, Any] | trio.Event:
|
||||||
|
|
||||||
ev = self.event_table.get(pattern)
|
ev = self.event_table.get(pattern)
|
||||||
|
|
||||||
|
|
@ -1528,22 +1526,23 @@ class MethodProxy:
|
||||||
|
|
||||||
|
|
||||||
async def open_aio_client_method_relay(
|
async def open_aio_client_method_relay(
|
||||||
chan: tractor.to_asyncio.LinkedTaskChannel,
|
from_trio: asyncio.Queue,
|
||||||
|
to_trio: trio.abc.SendChannel,
|
||||||
client: Client,
|
client: Client,
|
||||||
event_consumers: dict[str, trio.Event],
|
event_consumers: dict[str, trio.Event],
|
||||||
|
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
||||||
# sync with `open_client_proxy()` caller
|
# sync with `open_client_proxy()` caller
|
||||||
chan.started_nowait(client)
|
to_trio.send_nowait(client)
|
||||||
|
|
||||||
# TODO: separate channel for error handling?
|
# TODO: separate channel for error handling?
|
||||||
client.inline_errors(chan)
|
client.inline_errors(to_trio)
|
||||||
|
|
||||||
# relay all method requests to ``asyncio``-side client and deliver
|
# relay all method requests to ``asyncio``-side client and deliver
|
||||||
# back results
|
# back results
|
||||||
while not chan._to_trio._closed: # <- TODO, better check like `._web_bs`?
|
while not to_trio._closed:
|
||||||
msg: tuple[str, dict]|dict|None = await chan.get()
|
msg: tuple[str, dict] | dict | None = await from_trio.get()
|
||||||
match msg:
|
match msg:
|
||||||
case None: # termination sentinel
|
case None: # termination sentinel
|
||||||
log.info('asyncio `Client` method-proxy SHUTDOWN!')
|
log.info('asyncio `Client` method-proxy SHUTDOWN!')
|
||||||
|
|
@ -1556,7 +1555,7 @@ async def open_aio_client_method_relay(
|
||||||
try:
|
try:
|
||||||
resp = await meth(**kwargs)
|
resp = await meth(**kwargs)
|
||||||
# echo the msg back
|
# echo the msg back
|
||||||
chan.send_nowait({'result': resp})
|
to_trio.send_nowait({'result': resp})
|
||||||
|
|
||||||
except (
|
except (
|
||||||
RequestError,
|
RequestError,
|
||||||
|
|
@ -1564,10 +1563,10 @@ async def open_aio_client_method_relay(
|
||||||
# TODO: relay all errors to trio?
|
# TODO: relay all errors to trio?
|
||||||
# BaseException,
|
# BaseException,
|
||||||
) as err:
|
) as err:
|
||||||
chan.send_nowait({'exception': err})
|
to_trio.send_nowait({'exception': err})
|
||||||
|
|
||||||
case {'error': content}:
|
case {'error': content}:
|
||||||
chan.send_nowait({'exception': content})
|
to_trio.send_nowait({'exception': content})
|
||||||
|
|
||||||
case _:
|
case _:
|
||||||
raise ValueError(f'Unhandled msg {msg}')
|
raise ValueError(f'Unhandled msg {msg}')
|
||||||
|
|
|
||||||
|
|
@ -117,11 +117,7 @@ def pack_position(
|
||||||
symbol=fqme,
|
symbol=fqme,
|
||||||
currency=con.currency,
|
currency=con.currency,
|
||||||
size=float(pos.position),
|
size=float(pos.position),
|
||||||
avg_price=(
|
avg_price=float(pos.avgCost) / float(con.multiplier or 1.0),
|
||||||
float(pos.avgCost)
|
|
||||||
/
|
|
||||||
float(con.multiplier or 1.0)
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -362,10 +358,6 @@ async def update_and_audit_pos_msg(
|
||||||
size=ibpos.position,
|
size=ibpos.position,
|
||||||
|
|
||||||
avg_price=pikerpos.ppu,
|
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())
|
ibfmtmsg: str = pformat(ibpos._asdict())
|
||||||
|
|
@ -434,8 +426,7 @@ async def aggr_open_orders(
|
||||||
|
|
||||||
) -> None:
|
) -> 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()
|
trades: list[Trade] = client.ib.openTrades()
|
||||||
|
|
@ -556,10 +547,7 @@ async def open_trade_dialog(
|
||||||
),
|
),
|
||||||
|
|
||||||
# TODO: do this as part of `open_account()`!?
|
# TODO: do this as part of `open_account()`!?
|
||||||
open_symcache(
|
open_symcache('ib', only_from_memcache=True) as symcache,
|
||||||
'ib',
|
|
||||||
only_from_memcache=True,
|
|
||||||
) as symcache,
|
|
||||||
):
|
):
|
||||||
# Open a trade ledgers stack for appending trade records over
|
# Open a trade ledgers stack for appending trade records over
|
||||||
# multiple accounts.
|
# multiple accounts.
|
||||||
|
|
@ -567,10 +555,8 @@ async def open_trade_dialog(
|
||||||
ledgers: dict[str, TransactionLedger] = {}
|
ledgers: dict[str, TransactionLedger] = {}
|
||||||
tables: dict[str, Account] = {}
|
tables: dict[str, Account] = {}
|
||||||
order_msgs: list[Status] = []
|
order_msgs: list[Status] = []
|
||||||
conf: dict = get_config()
|
conf = get_config()
|
||||||
accounts_def_inv: bidict[str, str] = bidict(
|
accounts_def_inv: bidict[str, str] = bidict(conf['accounts']).inverse
|
||||||
conf['accounts']
|
|
||||||
).inverse
|
|
||||||
|
|
||||||
with (
|
with (
|
||||||
ExitStack() as lstack,
|
ExitStack() as lstack,
|
||||||
|
|
@ -720,11 +706,7 @@ async def open_trade_dialog(
|
||||||
# client-account and build out position msgs to deliver to
|
# client-account and build out position msgs to deliver to
|
||||||
# EMS.
|
# EMS.
|
||||||
for acctid, acnt in tables.items():
|
for acctid, acnt in tables.items():
|
||||||
active_pps: dict[str, Position]
|
active_pps, closed_pps = acnt.dump_active()
|
||||||
(
|
|
||||||
active_pps,
|
|
||||||
closed_pps,
|
|
||||||
) = acnt.dump_active()
|
|
||||||
|
|
||||||
for pps in [active_pps, closed_pps]:
|
for pps in [active_pps, closed_pps]:
|
||||||
piker_pps: list[Position] = list(pps.values())
|
piker_pps: list[Position] = list(pps.values())
|
||||||
|
|
@ -740,7 +722,6 @@ async def open_trade_dialog(
|
||||||
)
|
)
|
||||||
if ibpos:
|
if ibpos:
|
||||||
bs_mktid: str = str(ibpos.contract.conId)
|
bs_mktid: str = str(ibpos.contract.conId)
|
||||||
|
|
||||||
msg = await update_and_audit_pos_msg(
|
msg = await update_and_audit_pos_msg(
|
||||||
acctid,
|
acctid,
|
||||||
pikerpos,
|
pikerpos,
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# piker: trading gear for hackers
|
# piker: trading gear for hackers
|
||||||
# Copyright (C) 2018-forever Tyler Goodlet (in stewardship for pikers)
|
# Copyright (C) Tyler Goodlet (in stewardship for pikers)
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU Affero General Public License as published by
|
||||||
|
|
@ -13,12 +13,10 @@
|
||||||
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
"""
|
||||||
|
Data feed endpoints pre-wrapped and ready for use with ``tractor``/``trio``.
|
||||||
|
|
||||||
'''
|
"""
|
||||||
Data feed endpoints pre-wrapped and ready for use with `tractor`/`trio`
|
|
||||||
via "infected-asyncio-mode".
|
|
||||||
|
|
||||||
'''
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
import asyncio
|
import asyncio
|
||||||
from contextlib import (
|
from contextlib import (
|
||||||
|
|
@ -28,6 +26,7 @@ from dataclasses import asdict
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from pprint import pformat
|
from pprint import pformat
|
||||||
|
from math import isnan
|
||||||
import time
|
import time
|
||||||
from typing import (
|
from typing import (
|
||||||
Any,
|
Any,
|
||||||
|
|
@ -41,6 +40,7 @@ import numpy as np
|
||||||
from pendulum import (
|
from pendulum import (
|
||||||
now,
|
now,
|
||||||
from_timestamp,
|
from_timestamp,
|
||||||
|
# DateTime,
|
||||||
Duration,
|
Duration,
|
||||||
duration as mk_duration,
|
duration as mk_duration,
|
||||||
)
|
)
|
||||||
|
|
@ -69,10 +69,7 @@ from .api import (
|
||||||
Contract,
|
Contract,
|
||||||
RequestError,
|
RequestError,
|
||||||
)
|
)
|
||||||
from ._util import (
|
from ._util import data_reset_hack
|
||||||
data_reset_hack,
|
|
||||||
is_current_time_in_range,
|
|
||||||
)
|
|
||||||
from .symbols import get_mkt_info
|
from .symbols import get_mkt_info
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|
@ -187,8 +184,7 @@ async def open_history_client(
|
||||||
|
|
||||||
if (
|
if (
|
||||||
start_dt
|
start_dt
|
||||||
and
|
and start_dt.timestamp() == 0
|
||||||
start_dt.timestamp() == 0
|
|
||||||
):
|
):
|
||||||
await tractor.pause()
|
await tractor.pause()
|
||||||
|
|
||||||
|
|
@ -207,16 +203,14 @@ async def open_history_client(
|
||||||
):
|
):
|
||||||
count += 1
|
count += 1
|
||||||
mean += latency / count
|
mean += latency / count
|
||||||
log.debug(
|
print(
|
||||||
f'HISTORY FRAME QUERY LATENCY: {latency}\n'
|
f'HISTORY FRAME QUERY LATENCY: {latency}\n'
|
||||||
f'mean: {mean}'
|
f'mean: {mean}'
|
||||||
)
|
)
|
||||||
|
|
||||||
# could be trying to retreive bars over weekend
|
# could be trying to retreive bars over weekend
|
||||||
if out is None:
|
if out is None:
|
||||||
log.error(
|
log.error(f"Can't grab bars starting at {end_dt}!?!?")
|
||||||
f"No bars starting at {end_dt!r} !?!?"
|
|
||||||
)
|
|
||||||
if (
|
if (
|
||||||
end_dt
|
end_dt
|
||||||
and head_dt
|
and head_dt
|
||||||
|
|
@ -291,9 +285,8 @@ _pacing: str = (
|
||||||
|
|
||||||
async def wait_on_data_reset(
|
async def wait_on_data_reset(
|
||||||
proxy: MethodProxy,
|
proxy: MethodProxy,
|
||||||
|
|
||||||
reset_type: str = 'data',
|
reset_type: str = 'data',
|
||||||
timeout: float = 16,
|
timeout: float = 16, # float('inf'),
|
||||||
|
|
||||||
task_status: TaskStatus[
|
task_status: TaskStatus[
|
||||||
tuple[
|
tuple[
|
||||||
|
|
@ -302,47 +295,29 @@ async def wait_on_data_reset(
|
||||||
]
|
]
|
||||||
] = trio.TASK_STATUS_IGNORED,
|
] = trio.TASK_STATUS_IGNORED,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
'''
|
|
||||||
Wait on a (global-ish) "data-farm" event to be emitted
|
|
||||||
by the IB api server.
|
|
||||||
|
|
||||||
Allows syncing to reconnect event-messages emitted on the API
|
# TODO: we might have to put a task lock around this
|
||||||
console, such as:
|
# method..
|
||||||
|
hist_ev = proxy.status_event(
|
||||||
- 'HMDS data farm connection is OK:ushmds'
|
|
||||||
- 'Market data farm is connecting:usfuture'
|
|
||||||
- 'Market data farm connection is OK:usfuture'
|
|
||||||
|
|
||||||
Deliver a `(cs, done: Event)` pair to the caller to support it
|
|
||||||
waiting or cancelling the associated "data-reset-request";
|
|
||||||
normally a manual data-reset-req is expected to be the cause and
|
|
||||||
thus trigger such events (such as our click-hack-magic from
|
|
||||||
`.ib._util`).
|
|
||||||
|
|
||||||
'''
|
|
||||||
# ?TODO, do we need a task-lock around this method?
|
|
||||||
#
|
|
||||||
# register for an API "status event" wrapped for `trio`-sync.
|
|
||||||
hist_ev: trio.Event = proxy.status_event(
|
|
||||||
'HMDS data farm connection is OK:ushmds'
|
'HMDS data farm connection is OK:ushmds'
|
||||||
)
|
)
|
||||||
#
|
|
||||||
# ^TODO: other event-messages we might want to support waiting-for
|
# TODO: other event messages we might want to try and
|
||||||
# but i wasn't able to get reliable..
|
# wait for but i wasn't able to get any of this
|
||||||
#
|
# reliable..
|
||||||
# reconnect_start = proxy.status_event(
|
# reconnect_start = proxy.status_event(
|
||||||
# 'Market data farm is connecting:usfuture'
|
# 'Market data farm is connecting:usfuture'
|
||||||
# )
|
# )
|
||||||
# live_ev = proxy.status_event(
|
# live_ev = proxy.status_event(
|
||||||
# 'Market data farm connection is OK:usfuture'
|
# 'Market data farm connection is OK:usfuture'
|
||||||
# )
|
# )
|
||||||
|
|
||||||
# try to wait on the reset event(s) to arrive, a timeout
|
# try to wait on the reset event(s) to arrive, a timeout
|
||||||
# will trigger a retry up to 6 times (for now).
|
# will trigger a retry up to 6 times (for now).
|
||||||
client: Client = proxy._aio_ns
|
client: Client = proxy._aio_ns
|
||||||
|
|
||||||
done = trio.Event()
|
done = trio.Event()
|
||||||
with trio.move_on_after(timeout) as cs:
|
with trio.move_on_after(timeout) as cs:
|
||||||
|
|
||||||
task_status.started((cs, done))
|
task_status.started((cs, done))
|
||||||
|
|
||||||
log.warning(
|
log.warning(
|
||||||
|
|
@ -421,9 +396,8 @@ async def get_bars(
|
||||||
bool, # timed out hint
|
bool, # timed out hint
|
||||||
]:
|
]:
|
||||||
'''
|
'''
|
||||||
Request-n-retrieve historical data frames from a `trio.Task`
|
Retrieve historical data from a ``trio``-side task using
|
||||||
using a `MethoProxy` to query the `asyncio`-side's
|
a ``MethoProxy``.
|
||||||
`.ib.api.Client` methods.
|
|
||||||
|
|
||||||
'''
|
'''
|
||||||
global _data_resetter_task, _failed_resets
|
global _data_resetter_task, _failed_resets
|
||||||
|
|
@ -633,10 +607,7 @@ async def get_bars(
|
||||||
# such that simultaneous symbol queries don't try data resettingn
|
# such that simultaneous symbol queries don't try data resettingn
|
||||||
# too fast..
|
# too fast..
|
||||||
unset_resetter: bool = False
|
unset_resetter: bool = False
|
||||||
async with (
|
async with trio.open_nursery() as tn:
|
||||||
tractor.trionics.collapse_eg(),
|
|
||||||
trio.open_nursery() as tn
|
|
||||||
):
|
|
||||||
|
|
||||||
# start history request that we allow
|
# start history request that we allow
|
||||||
# to run indefinitely until a result is acquired
|
# to run indefinitely until a result is acquired
|
||||||
|
|
@ -682,12 +653,14 @@ async def get_bars(
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# per-actor cache of inter-eventloop-chans
|
|
||||||
_quote_streams: dict[str, trio.abc.ReceiveStream] = {}
|
_quote_streams: dict[str, trio.abc.ReceiveStream] = {}
|
||||||
|
|
||||||
|
|
||||||
async def _setup_quote_stream(
|
async def _setup_quote_stream(
|
||||||
chan: tractor.to_asyncio.LinkedTaskChannel,
|
|
||||||
|
from_trio: asyncio.Queue,
|
||||||
|
to_trio: trio.abc.SendChannel,
|
||||||
|
|
||||||
symbol: str,
|
symbol: str,
|
||||||
opts: tuple[int] = (
|
opts: tuple[int] = (
|
||||||
'375', # RT trade volume (excludes utrades)
|
'375', # RT trade volume (excludes utrades)
|
||||||
|
|
@ -705,13 +678,10 @@ async def _setup_quote_stream(
|
||||||
|
|
||||||
) -> trio.abc.ReceiveChannel:
|
) -> trio.abc.ReceiveChannel:
|
||||||
'''
|
'''
|
||||||
Stream L1 quotes via the `Ticker.updateEvent.connect(push)`
|
Stream a ticker using the std L1 api.
|
||||||
callback API by registering a `push` callback which simply
|
|
||||||
`chan.send_nowait()`s quote msgs back to the calling
|
|
||||||
parent-`trio.Task`-side.
|
|
||||||
|
|
||||||
NOTE, that this task-fn is run on the `asyncio.Task`-side ONLY
|
This task is ``asyncio``-side and must be called from
|
||||||
and is thus run via `tractor.to_asyncio.open_channel_from()`.
|
``tractor.to_asyncio.open_channel_from()``.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
global _quote_streams
|
global _quote_streams
|
||||||
|
|
@ -719,79 +689,39 @@ async def _setup_quote_stream(
|
||||||
async with load_aio_clients(
|
async with load_aio_clients(
|
||||||
disconnect_on_exit=False,
|
disconnect_on_exit=False,
|
||||||
) as accts2clients:
|
) as accts2clients:
|
||||||
|
|
||||||
# XXX since this is an `asyncio.Task`, we must use
|
|
||||||
# tractor.pause_from_sync()
|
|
||||||
|
|
||||||
caccount_name, client = get_preferred_data_client(accts2clients)
|
caccount_name, client = get_preferred_data_client(accts2clients)
|
||||||
contract = (
|
contract = contract or (await client.find_contract(symbol))
|
||||||
contract
|
to_trio.send_nowait(contract) # cuz why not
|
||||||
or
|
ticker: Ticker = client.ib.reqMktData(contract, ','.join(opts))
|
||||||
(await client.find_contract(symbol))
|
|
||||||
)
|
|
||||||
chan.started_nowait(contract) # cuz why not
|
|
||||||
ticker: Ticker = client.ib.reqMktData(
|
|
||||||
contract,
|
|
||||||
','.join(opts),
|
|
||||||
)
|
|
||||||
maybe_exc: BaseException|None = None
|
|
||||||
handler_tries: int = 0
|
|
||||||
aio_task: asyncio.Task = asyncio.current_task()
|
|
||||||
|
|
||||||
# ?TODO? this API is batch-wise and quite slow-af but,
|
# NOTE: it's batch-wise and slow af but I guess could
|
||||||
# - seems to be 5s updates?
|
# be good for backchecking? Seems to be every 5s maybe?
|
||||||
# - maybe we could use it for backchecking?
|
|
||||||
#
|
|
||||||
# ticker: Ticker = client.ib.reqTickByTickData(
|
# ticker: Ticker = client.ib.reqTickByTickData(
|
||||||
# contract, 'Last',
|
# contract, 'Last',
|
||||||
# )
|
# )
|
||||||
|
|
||||||
# define a very naive queue-pushing callback that relays
|
# # define a simple queue push routine that streams quote packets
|
||||||
# quote-packets directly the calling (parent) `trio.Task`.
|
# # to trio over the ``to_trio`` memory channel.
|
||||||
# Ensure on teardown we cancel the feed via their cancel API.
|
# to_trio, from_aio = trio.open_memory_channel(2**8) # type: ignore
|
||||||
#
|
|
||||||
def teardown():
|
def teardown():
|
||||||
'''
|
|
||||||
Disconnect our `push`-er callback and cancel the data-feed
|
|
||||||
for `contract`.
|
|
||||||
|
|
||||||
'''
|
|
||||||
nonlocal maybe_exc
|
|
||||||
ticker.updateEvent.disconnect(push)
|
ticker.updateEvent.disconnect(push)
|
||||||
report: str = f'Disconnected mkt-data for {symbol!r} due to '
|
log.error(
|
||||||
if maybe_exc is not None:
|
f'Disconnected stream for `{symbol}`'
|
||||||
report += (
|
)
|
||||||
'error,\n'
|
|
||||||
f'{maybe_exc!r}\n'
|
|
||||||
)
|
|
||||||
log.error(report)
|
|
||||||
else:
|
|
||||||
report += (
|
|
||||||
'cancellation.\n'
|
|
||||||
)
|
|
||||||
log.cancel(report)
|
|
||||||
|
|
||||||
client.ib.cancelMktData(contract)
|
client.ib.cancelMktData(contract)
|
||||||
|
|
||||||
# decouple broadcast mem chan
|
# decouple broadcast mem chan
|
||||||
_quote_streams.pop(symbol, None)
|
_quote_streams.pop(symbol, None)
|
||||||
|
|
||||||
def push(
|
def push(t: Ticker) -> None:
|
||||||
t: Ticker,
|
"""
|
||||||
tries_before_raise: int = 6,
|
Push quotes to trio task.
|
||||||
) -> None:
|
|
||||||
'''
|
|
||||||
Push quotes verbatim to parent-side `trio.Task`.
|
|
||||||
|
|
||||||
'''
|
"""
|
||||||
nonlocal maybe_exc, handler_tries
|
# log.debug(t)
|
||||||
# log.debug(f'new IB quote: {t}\n')
|
|
||||||
try:
|
try:
|
||||||
chan.send_nowait(t)
|
to_trio.send_nowait(t)
|
||||||
|
|
||||||
# XXX TODO XXX replicate in `tractor` tests
|
|
||||||
# as per `CancelledError`-handler notes below!
|
|
||||||
# assert 0
|
|
||||||
except (
|
except (
|
||||||
trio.BrokenResourceError,
|
trio.BrokenResourceError,
|
||||||
|
|
||||||
|
|
@ -806,107 +736,38 @@ async def _setup_quote_stream(
|
||||||
# resulting in tracebacks spammed to console..
|
# resulting in tracebacks spammed to console..
|
||||||
# Manually do the dereg ourselves.
|
# Manually do the dereg ourselves.
|
||||||
teardown()
|
teardown()
|
||||||
|
|
||||||
# for slow debugging purposes to avoid clobbering prompt
|
|
||||||
# with log msgs
|
|
||||||
except trio.WouldBlock:
|
except trio.WouldBlock:
|
||||||
log.exception(
|
# log.warning(
|
||||||
f'Asyncio->Trio `chan.send_nowait()` blocked !?\n'
|
# f'channel is blocking symbol feed for {symbol}?'
|
||||||
f'\n'
|
# f'\n{to_trio.statistics}'
|
||||||
f'{chan._to_trio.statistics()}\n'
|
# )
|
||||||
)
|
pass
|
||||||
|
|
||||||
# ?TODO, handle re-connection attempts?
|
|
||||||
except BaseException as _berr:
|
|
||||||
berr = _berr
|
|
||||||
if handler_tries >= tries_before_raise:
|
|
||||||
# breakpoint()
|
|
||||||
maybe_exc = _berr
|
|
||||||
# task.set_exception(berr)
|
|
||||||
aio_task.cancel(msg=berr.args)
|
|
||||||
raise berr
|
|
||||||
else:
|
|
||||||
handler_tries += 1
|
|
||||||
|
|
||||||
log.exception(
|
|
||||||
f'Failed to push ticker quote !?\n'
|
|
||||||
f'handler_tries={handler_tries!r}\n'
|
|
||||||
f'ticker: {t!r}\n'
|
|
||||||
f'\n'
|
|
||||||
f'{chan._to_trio.statistics()}\n'
|
|
||||||
f'\n'
|
|
||||||
f'CAUSE: {berr}\n'
|
|
||||||
)
|
|
||||||
|
|
||||||
|
# except trio.WouldBlock:
|
||||||
|
# # for slow debugging purposes to avoid clobbering prompt
|
||||||
|
# # with log msgs
|
||||||
|
# pass
|
||||||
|
|
||||||
ticker.updateEvent.connect(push)
|
ticker.updateEvent.connect(push)
|
||||||
try:
|
try:
|
||||||
await asyncio.sleep(float('inf'))
|
await asyncio.sleep(float('inf'))
|
||||||
|
|
||||||
# XXX, for debug.. TODO? can we rm again?
|
|
||||||
#
|
|
||||||
# tractor.pause_from_sync()
|
|
||||||
# while True:
|
|
||||||
# await asyncio.sleep(1.6)
|
|
||||||
# if ticker.ticks:
|
|
||||||
# log.debug(
|
|
||||||
# f'ticker.ticks = \n'
|
|
||||||
# f'{ticker.ticks}\n'
|
|
||||||
# )
|
|
||||||
# else:
|
|
||||||
# log.warning(
|
|
||||||
# 'UHH no ticker.ticks ??'
|
|
||||||
# )
|
|
||||||
|
|
||||||
# XXX TODO XXX !?!?
|
|
||||||
# apparently **without this handler** and the subsequent
|
|
||||||
# re-raising of `maybe_exc from _taskc` cancelling the
|
|
||||||
# `aio_task` from the `push()`-callback will cause a very
|
|
||||||
# strange chain of exc raising that breaks alll sorts of
|
|
||||||
# downstream callers, tasks and remote-actor tasks!?
|
|
||||||
#
|
|
||||||
# -[ ] we need some lowlevel reproducting tests to replicate
|
|
||||||
# those worst-case scenarios in `tractor` core!!
|
|
||||||
# -[ ] likely we should factor-out the `tractor.to_asyncio`
|
|
||||||
# attempts at workarounds in `.translate_aio_errors()`
|
|
||||||
# for failed `asyncio.Task.set_exception()` to either
|
|
||||||
# call `aio_task.cancel()` and/or
|
|
||||||
# `aio_task._fut_waiter.set_exception()` to a re-useable
|
|
||||||
# toolset in something like a `.to_asyncio._utils`??
|
|
||||||
#
|
|
||||||
except asyncio.CancelledError as _taskc:
|
|
||||||
if maybe_exc is not None:
|
|
||||||
raise maybe_exc from _taskc
|
|
||||||
|
|
||||||
raise _taskc
|
|
||||||
|
|
||||||
except BaseException as _berr:
|
|
||||||
# stash any crash cause for reporting in `teardown()`
|
|
||||||
maybe_exc = _berr
|
|
||||||
raise _berr
|
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
# always disconnect our `push()` and cancel the
|
|
||||||
# ib-"mkt-data-feed".
|
|
||||||
teardown()
|
teardown()
|
||||||
|
|
||||||
|
# return from_aio
|
||||||
|
|
||||||
|
|
||||||
@acm
|
@acm
|
||||||
async def open_aio_quote_stream(
|
async def open_aio_quote_stream(
|
||||||
|
|
||||||
symbol: str,
|
symbol: str,
|
||||||
contract: Contract|None = None,
|
contract: Contract | None = None,
|
||||||
|
|
||||||
) -> (
|
) -> (
|
||||||
trio.abc.Channel| # iface
|
trio.abc.Channel| # iface
|
||||||
tractor.to_asyncio.LinkedTaskChannel # actually
|
tractor.to_asyncio.LinkedTaskChannel # actually
|
||||||
):
|
):
|
||||||
'''
|
|
||||||
Open a real-time `Ticker` quote stream from an `asyncio.Task`
|
|
||||||
spawned via `tractor.to_asyncio.open_channel_from()`, deliver the
|
|
||||||
inter-event-loop channel to the `trio.Task` caller and cache it
|
|
||||||
globally for re-use.
|
|
||||||
|
|
||||||
'''
|
|
||||||
from tractor.trionics import broadcast_receiver
|
from tractor.trionics import broadcast_receiver
|
||||||
global _quote_streams
|
global _quote_streams
|
||||||
|
|
||||||
|
|
@ -932,10 +793,6 @@ async def open_aio_quote_stream(
|
||||||
|
|
||||||
assert contract
|
assert contract
|
||||||
|
|
||||||
# TODO? de-reg on teardown of last consumer task?
|
|
||||||
# -> why aren't we using `.trionics.maybe_open_context()`
|
|
||||||
# here again?? (we are in `open_client_proxies()` tho?)
|
|
||||||
#
|
|
||||||
# cache feed for later consumers
|
# cache feed for later consumers
|
||||||
_quote_streams[symbol] = from_aio
|
_quote_streams[symbol] = from_aio
|
||||||
|
|
||||||
|
|
@ -950,12 +807,7 @@ def normalize(
|
||||||
calc_price: bool = False
|
calc_price: bool = False
|
||||||
|
|
||||||
) -> dict:
|
) -> dict:
|
||||||
'''
|
|
||||||
Translate `ib_async`'s `Ticker.ticks` values to a `piker`
|
|
||||||
normalized `dict` form for transmit to downstream `.data` layer
|
|
||||||
consumers.
|
|
||||||
|
|
||||||
'''
|
|
||||||
# check for special contract types
|
# check for special contract types
|
||||||
con = ticker.contract
|
con = ticker.contract
|
||||||
fqme, calc_price = con2fqme(con)
|
fqme, calc_price = con2fqme(con)
|
||||||
|
|
@ -974,7 +826,7 @@ def normalize(
|
||||||
|
|
||||||
tbt = ticker.tickByTicks
|
tbt = ticker.tickByTicks
|
||||||
if tbt:
|
if tbt:
|
||||||
log.info(f'tickbyticks:\n {ticker.tickByTicks}')
|
print(f'tickbyticks:\n {ticker.tickByTicks}')
|
||||||
|
|
||||||
ticker.ticks = new_ticks
|
ticker.ticks = new_ticks
|
||||||
|
|
||||||
|
|
@ -1010,39 +862,27 @@ def normalize(
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
# ?TODO? feels like this task-fn could be factored to reduce some
|
|
||||||
# indentation levels?
|
|
||||||
# -[ ] the reconnect while loop on ib-gw "data farm connection.."s
|
|
||||||
# -[ ] everything embedded under the `async with aclosing(stream):`
|
|
||||||
# as the "meat" of the quote delivery once the connection is
|
|
||||||
# stable.
|
|
||||||
#
|
|
||||||
async def stream_quotes(
|
async def stream_quotes(
|
||||||
|
|
||||||
send_chan: trio.abc.SendChannel,
|
send_chan: trio.abc.SendChannel,
|
||||||
symbols: list[str],
|
symbols: list[str],
|
||||||
feed_is_live: trio.Event,
|
feed_is_live: trio.Event,
|
||||||
|
loglevel: str = None,
|
||||||
# TODO? we need to hook into the `ib_async` logger like
|
|
||||||
# we can with i3ipc from modden!
|
|
||||||
# loglevel: str|None = None,
|
|
||||||
|
|
||||||
# startup sync
|
# startup sync
|
||||||
task_status: TaskStatus[tuple[dict, dict]] = trio.TASK_STATUS_IGNORED,
|
task_status: TaskStatus[tuple[dict, dict]] = trio.TASK_STATUS_IGNORED,
|
||||||
|
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Stream `symbols[0]` quotes back via `send_chan`.
|
Stream symbol quotes.
|
||||||
|
|
||||||
The `feed_is_live: Event` is set to signal the caller that it can
|
This is a ``trio`` callable routine meant to be invoked
|
||||||
begin processing msgs from the mem-chan.
|
once the brokerd is up.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
# TODO: support multiple subscriptions
|
# TODO: support multiple subscriptions
|
||||||
sym: str = symbols[0]
|
sym = symbols[0]
|
||||||
log.info(
|
log.info(f'request for real-time quotes: {sym}')
|
||||||
f'request for real-time quotes\n'
|
|
||||||
f'sym: {sym!r}\n'
|
|
||||||
)
|
|
||||||
|
|
||||||
init_msgs: list[FeedInit] = []
|
init_msgs: list[FeedInit] = []
|
||||||
|
|
||||||
|
|
@ -1051,52 +891,34 @@ async def stream_quotes(
|
||||||
details: ibis.ContractDetails
|
details: ibis.ContractDetails
|
||||||
async with (
|
async with (
|
||||||
open_data_client() as proxy,
|
open_data_client() as proxy,
|
||||||
|
# trio.open_nursery() as tn,
|
||||||
):
|
):
|
||||||
mkt, details = await get_mkt_info(
|
mkt, details = await get_mkt_info(
|
||||||
sym,
|
sym,
|
||||||
proxy=proxy, # passed to avoid implicit client load
|
proxy=proxy, # passed to avoid implicit client load
|
||||||
)
|
)
|
||||||
|
|
||||||
# is venue active rn?
|
|
||||||
venue_is_open: bool = any(
|
|
||||||
is_current_time_in_range(
|
|
||||||
start_dt=sesh.start,
|
|
||||||
end_dt=sesh.end,
|
|
||||||
)
|
|
||||||
for sesh in details.tradingSessions()
|
|
||||||
)
|
|
||||||
|
|
||||||
init_msg = FeedInit(mkt_info=mkt)
|
init_msg = FeedInit(mkt_info=mkt)
|
||||||
|
|
||||||
# NOTE, tell sampler (via config) to skip vlm summing for dst
|
|
||||||
# assets which provide no vlm data..
|
|
||||||
if mkt.dst.atype in {
|
if mkt.dst.atype in {
|
||||||
'fiat',
|
'fiat',
|
||||||
'index',
|
'index',
|
||||||
'commodity',
|
'commodity',
|
||||||
}:
|
}:
|
||||||
|
# tell sampler config that it shouldn't do vlm summing.
|
||||||
init_msg.shm_write_opts['sum_tick_vlm'] = False
|
init_msg.shm_write_opts['sum_tick_vlm'] = False
|
||||||
init_msg.shm_write_opts['has_vlm'] = False
|
init_msg.shm_write_opts['has_vlm'] = False
|
||||||
|
|
||||||
init_msgs.append(init_msg)
|
init_msgs.append(init_msg)
|
||||||
|
|
||||||
con: Contract = details.contract
|
con: Contract = details.contract
|
||||||
first_ticker: Ticker|None = None
|
first_ticker: Ticker | None = None
|
||||||
|
with trio.move_on_after(1):
|
||||||
timeout: float = 1.6
|
|
||||||
with trio.move_on_after(timeout) as quote_cs:
|
|
||||||
first_ticker: Ticker = await proxy.get_quote(
|
first_ticker: Ticker = await proxy.get_quote(
|
||||||
contract=con,
|
contract=con,
|
||||||
raise_on_timeout=False,
|
raise_on_timeout=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
# XXX should never happen with this ep right?
|
|
||||||
# but if so then, more then likely mkt is closed?
|
|
||||||
if quote_cs.cancelled_caught:
|
|
||||||
log.warning(
|
|
||||||
f'First quote req timed out after {timeout!r}s'
|
|
||||||
)
|
|
||||||
|
|
||||||
if first_ticker:
|
if first_ticker:
|
||||||
first_quote: dict = normalize(first_ticker)
|
first_quote: dict = normalize(first_ticker)
|
||||||
|
|
||||||
|
|
@ -1108,27 +930,28 @@ async def stream_quotes(
|
||||||
f'{pformat(first_quote)}\n'
|
f'{pformat(first_quote)}\n'
|
||||||
)
|
)
|
||||||
|
|
||||||
# XXX NOTE: whenever we're "outside regular trading hours"
|
# NOTE: it might be outside regular trading hours for
|
||||||
# (only relevant for assets coming from the "legacy markets"
|
# assets with "standard venue operating hours" so we
|
||||||
# space) so we basically (from an API/runtime-operational
|
# only "pretend the feed is live" when the dst asset
|
||||||
# perspective) "pretend the feed is live" even if it's
|
# type is NOT within the NON-NORMAL-venue set: aka not
|
||||||
# actually closed.
|
# commodities, forex or crypto currencies which CAN
|
||||||
#
|
# always return a NaN on a snap quote request during
|
||||||
# IOW, we signal to the effective caller (task) that the live
|
# normal venue hours. In the case of a closed venue
|
||||||
# feed is "already up" but really we're just indicating that
|
# (equitiies, futes, bonds etc.) we at least try to
|
||||||
# the OHLCV history can start being loaded immediately by the
|
# grab the OHLC history.
|
||||||
# `piker.data`/`.tsp` layers.
|
if (
|
||||||
#
|
first_ticker
|
||||||
# XXX, deats: the "pretend we're live" is just done by
|
and
|
||||||
# a `feed_is_live.set()` even though nothing is actually live
|
isnan(first_ticker.last)
|
||||||
# Bp
|
# SO, if the last quote price value is NaN we ONLY
|
||||||
if not venue_is_open:
|
# "pretend to do" `feed_is_live.set()` if it's a known
|
||||||
log.warning(
|
# dst asset venue with a lot of closed operating hours.
|
||||||
f'Venue is closed, unable to establish real-time feed.\n'
|
and mkt.dst.atype not in {
|
||||||
f'mkt: {mkt!r}\n'
|
'commodity',
|
||||||
f'\n'
|
'fiat',
|
||||||
f'first_ticker: {first_ticker}\n'
|
'crypto',
|
||||||
)
|
}
|
||||||
|
):
|
||||||
task_status.started((
|
task_status.started((
|
||||||
init_msgs,
|
init_msgs,
|
||||||
first_quote,
|
first_quote,
|
||||||
|
|
@ -1139,12 +962,10 @@ async def stream_quotes(
|
||||||
feed_is_live.set()
|
feed_is_live.set()
|
||||||
|
|
||||||
# block and let data history backfill code run.
|
# 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()
|
await trio.sleep_forever()
|
||||||
|
return # we never expect feed to come up?
|
||||||
|
|
||||||
# ?TODO, we could instead spawn a task that waits on a feed
|
# TODO: we should instead spawn a task that waits on a feed
|
||||||
# to start and let it wait indefinitely..instead of this
|
# to start and let it wait indefinitely..instead of this
|
||||||
# hard coded stuff.
|
# hard coded stuff.
|
||||||
# async def wait_for_first_quote():
|
# async def wait_for_first_quote():
|
||||||
|
|
@ -1166,27 +987,24 @@ async def stream_quotes(
|
||||||
'Rxed init quote:\n'
|
'Rxed init quote:\n'
|
||||||
f'{pformat(first_quote)}'
|
f'{pformat(first_quote)}'
|
||||||
)
|
)
|
||||||
cs: trio.CancelScope|None = None
|
cs: trio.CancelScope | None = None
|
||||||
startup: bool = True
|
startup: bool = True
|
||||||
iter_quotes: trio.abc.Channel
|
iter_quotes: trio.abc.Channel
|
||||||
while (
|
while (
|
||||||
startup
|
startup
|
||||||
or
|
or cs.cancel_called
|
||||||
cs.cancel_called
|
|
||||||
):
|
):
|
||||||
with trio.CancelScope() as cs:
|
with trio.CancelScope() as cs:
|
||||||
async with (
|
async with (
|
||||||
tractor.trionics.collapse_eg(),
|
|
||||||
trio.open_nursery() as tn,
|
trio.open_nursery() as tn,
|
||||||
open_aio_quote_stream(
|
open_aio_quote_stream(
|
||||||
symbol=sym,
|
symbol=sym,
|
||||||
contract=con,
|
contract=con,
|
||||||
) as iter_quotes,
|
) as iter_quotes,
|
||||||
):
|
):
|
||||||
# ?TODO? can we rm this - particularly for `ib_async`?
|
|
||||||
# ugh, clear ticks since we've consumed them
|
# ugh, clear ticks since we've consumed them
|
||||||
# (ahem, ib_insync is stateful trash)
|
# (ahem, ib_insync is stateful trash)
|
||||||
# first_ticker.ticks = []
|
first_ticker.ticks = []
|
||||||
|
|
||||||
# only on first entry at feed boot up
|
# only on first entry at feed boot up
|
||||||
if startup:
|
if startup:
|
||||||
|
|
@ -1200,8 +1018,8 @@ async def stream_quotes(
|
||||||
# data feed event.
|
# data feed event.
|
||||||
async def reset_on_feed():
|
async def reset_on_feed():
|
||||||
|
|
||||||
# ??TODO? this seems to be surpressed from the
|
# TODO: this seems to be surpressed from the
|
||||||
# traceback in `tractor`?
|
# traceback in ``tractor``?
|
||||||
# assert 0
|
# assert 0
|
||||||
|
|
||||||
rt_ev = proxy.status_event(
|
rt_ev = proxy.status_event(
|
||||||
|
|
@ -1247,7 +1065,7 @@ async def stream_quotes(
|
||||||
# ugh, clear ticks since we've
|
# ugh, clear ticks since we've
|
||||||
# consumed them (ahem, ib_insync is
|
# consumed them (ahem, ib_insync is
|
||||||
# truly stateful trash)
|
# truly stateful trash)
|
||||||
# ticker.ticks = []
|
ticker.ticks = []
|
||||||
|
|
||||||
# XXX: this works because we don't use
|
# XXX: this works because we don't use
|
||||||
# ``aclosing()`` above?
|
# ``aclosing()`` above?
|
||||||
|
|
@ -1269,12 +1087,8 @@ async def stream_quotes(
|
||||||
async for ticker in iter_quotes:
|
async for ticker in iter_quotes:
|
||||||
quote = normalize(ticker)
|
quote = normalize(ticker)
|
||||||
fqme: str = quote['fqme']
|
fqme: str = quote['fqme']
|
||||||
log.debug(
|
|
||||||
f'Sending quote\n'
|
|
||||||
f'{quote}'
|
|
||||||
)
|
|
||||||
await send_chan.send({fqme: quote})
|
await send_chan.send({fqme: quote})
|
||||||
|
|
||||||
# ugh, clear ticks since we've consumed them
|
# ugh, clear ticks since we've consumed them
|
||||||
# ticker.ticks = []
|
ticker.ticks = []
|
||||||
# last = time.time()
|
# last = time.time()
|
||||||
|
|
|
||||||
|
|
@ -388,7 +388,6 @@ async def open_brokerd_dialog(
|
||||||
for ep_name in [
|
for ep_name in [
|
||||||
'open_trade_dialog', # probably final name?
|
'open_trade_dialog', # probably final name?
|
||||||
'trades_dialogue', # legacy
|
'trades_dialogue', # legacy
|
||||||
# ^!TODO, rm this since all backends ported no ?!?
|
|
||||||
]:
|
]:
|
||||||
trades_endpoint = getattr(
|
trades_endpoint = getattr(
|
||||||
brokermod,
|
brokermod,
|
||||||
|
|
@ -1028,18 +1027,8 @@ async def translate_and_relay_brokerd_events(
|
||||||
)
|
)
|
||||||
|
|
||||||
if status == 'closed':
|
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':
|
elif status == 'canceled':
|
||||||
log.cancel(f'Cancellation for {oid} is complete!')
|
log.cancel(f'Cancellation for {oid} is complete!')
|
||||||
|
|
@ -1563,18 +1552,19 @@ async def maybe_open_trade_relays(
|
||||||
|
|
||||||
@tractor.context
|
@tractor.context
|
||||||
async def _emsd_main(
|
async def _emsd_main(
|
||||||
ctx: tractor.Context, # becomes `ems_ctx` below
|
ctx: tractor.Context,
|
||||||
fqme: str,
|
fqme: str,
|
||||||
exec_mode: str, # ('paper', 'live')
|
exec_mode: str, # ('paper', 'live')
|
||||||
loglevel: str|None = None,
|
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[BrokerdPosition],
|
||||||
],
|
],
|
||||||
list[str], # accounts
|
list[str],
|
||||||
dict[str, Status], # dialogs
|
dict[str, Status],
|
||||||
]:
|
]:
|
||||||
'''
|
'''
|
||||||
EMS (sub)actor entrypoint providing the execution management
|
EMS (sub)actor entrypoint providing the execution management
|
||||||
|
|
|
||||||
|
|
@ -301,9 +301,6 @@ class BrokerdError(Struct):
|
||||||
|
|
||||||
# TODO: yeah, so we REALLY need to completely deprecate
|
# TODO: yeah, so we REALLY need to completely deprecate
|
||||||
# this and use the `.accounting.Position` msg-type instead..
|
# 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):
|
class BrokerdPosition(Struct):
|
||||||
'''
|
'''
|
||||||
Position update event from brokerd.
|
Position update event from brokerd.
|
||||||
|
|
@ -316,4 +313,3 @@ class BrokerdPosition(Struct):
|
||||||
avg_price: float
|
avg_price: float
|
||||||
currency: str = ''
|
currency: str = ''
|
||||||
name: str = 'position'
|
name: str = 'position'
|
||||||
bs_mktid: str|int|None = None
|
|
||||||
|
|
|
||||||
|
|
@ -134,65 +134,65 @@ def pikerd(
|
||||||
Spawn the piker broker-daemon.
|
Spawn the piker broker-daemon.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
# from tractor.devx import maybe_open_crash_handler
|
from tractor.devx import maybe_open_crash_handler
|
||||||
# with maybe_open_crash_handler(pdb=False):
|
with maybe_open_crash_handler(pdb=pdb):
|
||||||
log = get_console_log(loglevel, name='cli')
|
log = get_console_log(loglevel, name='cli')
|
||||||
|
|
||||||
if pdb:
|
if pdb:
|
||||||
log.warning((
|
log.warning((
|
||||||
"\n"
|
"\n"
|
||||||
"!!! YOU HAVE ENABLED DAEMON DEBUG MODE !!!\n"
|
"!!! YOU HAVE ENABLED DAEMON DEBUG MODE !!!\n"
|
||||||
"When a `piker` daemon crashes it will block the "
|
"When a `piker` daemon crashes it will block the "
|
||||||
"task-thread until resumed from console!\n"
|
"task-thread until resumed from console!\n"
|
||||||
"\n"
|
"\n"
|
||||||
))
|
|
||||||
|
|
||||||
# service-actor registry endpoint socket-address set
|
|
||||||
regaddrs: list[tuple[str, int]] = []
|
|
||||||
|
|
||||||
conf, _ = config.load(
|
|
||||||
conf_name='conf',
|
|
||||||
)
|
|
||||||
network: dict = conf.get('network')
|
|
||||||
if (
|
|
||||||
network is None
|
|
||||||
and not maddr
|
|
||||||
):
|
|
||||||
regaddrs = [(
|
|
||||||
_default_registry_host,
|
|
||||||
_default_registry_port,
|
|
||||||
)]
|
|
||||||
|
|
||||||
else:
|
|
||||||
eps: dict = load_trans_eps(
|
|
||||||
network,
|
|
||||||
maddr,
|
|
||||||
)
|
|
||||||
for layers in eps['pikerd']:
|
|
||||||
regaddrs.append((
|
|
||||||
layers['ipv4']['addr'],
|
|
||||||
layers['tcp']['port'],
|
|
||||||
))
|
))
|
||||||
|
|
||||||
from .. import service
|
# service-actor registry endpoint socket-address set
|
||||||
|
regaddrs: list[tuple[str, int]] = []
|
||||||
|
|
||||||
async def main():
|
conf, _ = config.load(
|
||||||
service_mngr: service.Services
|
conf_name='conf',
|
||||||
async with (
|
)
|
||||||
service.open_pikerd(
|
network: dict = conf.get('network')
|
||||||
registry_addrs=regaddrs,
|
if (
|
||||||
loglevel=loglevel,
|
network is None
|
||||||
debug_mode=pdb,
|
and not maddr
|
||||||
# enable_transports=['uds'],
|
|
||||||
enable_transports=['tcp'],
|
|
||||||
) as service_mngr,
|
|
||||||
):
|
):
|
||||||
assert service_mngr
|
regaddrs = [(
|
||||||
# ?TODO? spawn all other sub-actor daemons according to
|
_default_registry_host,
|
||||||
# multiaddress endpoint spec defined by user config
|
_default_registry_port,
|
||||||
await trio.sleep_forever()
|
)]
|
||||||
|
|
||||||
trio.run(main)
|
else:
|
||||||
|
eps: dict = load_trans_eps(
|
||||||
|
network,
|
||||||
|
maddr,
|
||||||
|
)
|
||||||
|
for layers in eps['pikerd']:
|
||||||
|
regaddrs.append((
|
||||||
|
layers['ipv4']['addr'],
|
||||||
|
layers['tcp']['port'],
|
||||||
|
))
|
||||||
|
|
||||||
|
from .. import service
|
||||||
|
|
||||||
|
async def main():
|
||||||
|
service_mngr: service.Services
|
||||||
|
|
||||||
|
async with (
|
||||||
|
service.open_pikerd(
|
||||||
|
registry_addrs=regaddrs,
|
||||||
|
loglevel=loglevel,
|
||||||
|
debug_mode=pdb,
|
||||||
|
enable_transports=['uds'],
|
||||||
|
) as service_mngr,
|
||||||
|
):
|
||||||
|
assert service_mngr
|
||||||
|
# ?TODO? spawn all other sub-actor daemons according to
|
||||||
|
# multiaddress endpoint spec defined by user config
|
||||||
|
await trio.sleep_forever()
|
||||||
|
|
||||||
|
trio.run(main)
|
||||||
|
|
||||||
|
|
||||||
@click.group(context_settings=config._context_defaults)
|
@click.group(context_settings=config._context_defaults)
|
||||||
|
|
@ -307,10 +307,6 @@ def services(config, tl, ports):
|
||||||
if not ports:
|
if not ports:
|
||||||
ports = [_default_registry_port]
|
ports = [_default_registry_port]
|
||||||
|
|
||||||
addr = tractor._addr.wrap_address(
|
|
||||||
addr=(host, ports[0])
|
|
||||||
)
|
|
||||||
|
|
||||||
async def list_services():
|
async def list_services():
|
||||||
nonlocal host
|
nonlocal host
|
||||||
async with (
|
async with (
|
||||||
|
|
@ -319,17 +315,15 @@ def services(config, tl, ports):
|
||||||
loglevel=config['loglevel'] if tl else None,
|
loglevel=config['loglevel'] if tl else None,
|
||||||
),
|
),
|
||||||
tractor.get_registry(
|
tractor.get_registry(
|
||||||
addr=addr,
|
host=host,
|
||||||
|
port=ports[0]
|
||||||
) as portal
|
) as portal
|
||||||
):
|
):
|
||||||
registry = await portal.run_from_ns(
|
registry = await portal.run_from_ns('self', 'get_registry')
|
||||||
'self',
|
|
||||||
'get_registry',
|
|
||||||
)
|
|
||||||
json_d = {}
|
json_d = {}
|
||||||
for key, socket in registry.items():
|
for key, socket in registry.items():
|
||||||
json_d[key] = f'{socket}'
|
host, port = socket
|
||||||
|
json_d[key] = f'{host}:{port}'
|
||||||
click.echo(f"{colorize_json(json_d)}")
|
click.echo(f"{colorize_json(json_d)}")
|
||||||
|
|
||||||
trio.run(list_services)
|
trio.run(list_services)
|
||||||
|
|
|
||||||
|
|
@ -41,13 +41,10 @@ from .log import get_logger
|
||||||
log = get_logger('broker-config')
|
log = get_logger('broker-config')
|
||||||
|
|
||||||
|
|
||||||
# XXX NOTE: taken from `click`
|
# XXX NOTE: taken from ``click`` since apparently they have some
|
||||||
# |_https://github.com/pallets/click/blob/main/src/click/utils.py#L449
|
# super weirdness with sigint and sudo..no clue
|
||||||
#
|
# we're probably going to slowly just modify it to our own version over
|
||||||
# (since apparently they have some super weirdness with SIGINT and
|
# time..
|
||||||
# sudo.. no clue we're probably going to slowly just modify it to our
|
|
||||||
# own version over time..)
|
|
||||||
#
|
|
||||||
def get_app_dir(
|
def get_app_dir(
|
||||||
app_name: str,
|
app_name: str,
|
||||||
roaming: bool = True,
|
roaming: bool = True,
|
||||||
|
|
@ -264,7 +261,7 @@ def load(
|
||||||
MutableMapping,
|
MutableMapping,
|
||||||
] = tomllib.loads,
|
] = tomllib.loads,
|
||||||
|
|
||||||
touch_if_dne: bool = True,
|
touch_if_dne: bool = False,
|
||||||
|
|
||||||
**tomlkws,
|
**tomlkws,
|
||||||
|
|
||||||
|
|
@ -273,7 +270,7 @@ def load(
|
||||||
Load config file by name.
|
Load config file by name.
|
||||||
|
|
||||||
If desired config is not in the top level piker-user config path then
|
If desired config is not in the top level piker-user config path then
|
||||||
pass the `path: Path` explicitly.
|
pass the ``path: Path`` explicitly.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
# create the $HOME/.config/piker dir if dne
|
# create the $HOME/.config/piker dir if dne
|
||||||
|
|
@ -288,8 +285,7 @@ def load(
|
||||||
|
|
||||||
if (
|
if (
|
||||||
not path.is_file()
|
not path.is_file()
|
||||||
and
|
and touch_if_dne
|
||||||
touch_if_dne
|
|
||||||
):
|
):
|
||||||
# only do a template if no path provided,
|
# only do a template if no path provided,
|
||||||
# just touch an empty file with same name.
|
# just touch an empty file with same name.
|
||||||
|
|
|
||||||
|
|
@ -91,18 +91,6 @@ class SymbologyCache(Struct):
|
||||||
# provided by the backend pkg.
|
# provided by the backend pkg.
|
||||||
mktmaps: dict[str, MktPair] = field(default_factory=dict)
|
mktmaps: dict[str, MktPair] = field(default_factory=dict)
|
||||||
|
|
||||||
def pformat(self) -> str:
|
|
||||||
return (
|
|
||||||
f'<{type(self).__name__}(\n'
|
|
||||||
f' .mod: {self.mod!r}\n'
|
|
||||||
f' .assets: {len(self.assets)!r}\n'
|
|
||||||
f' .pairs: {len(self.pairs)!r}\n'
|
|
||||||
f' .mktmaps: {len(self.mktmaps)!r}\n'
|
|
||||||
f')>'
|
|
||||||
)
|
|
||||||
|
|
||||||
__repr__ = pformat
|
|
||||||
|
|
||||||
def write_config(self) -> None:
|
def write_config(self) -> None:
|
||||||
|
|
||||||
# put the backend's pair-struct type ref at the top
|
# put the backend's pair-struct type ref at the top
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ from functools import partial
|
||||||
from types import ModuleType
|
from types import ModuleType
|
||||||
from typing import (
|
from typing import (
|
||||||
Any,
|
Any,
|
||||||
|
Optional,
|
||||||
Callable,
|
Callable,
|
||||||
AsyncContextManager,
|
AsyncContextManager,
|
||||||
AsyncGenerator,
|
AsyncGenerator,
|
||||||
|
|
@ -34,7 +35,6 @@ from typing import (
|
||||||
)
|
)
|
||||||
import json
|
import json
|
||||||
|
|
||||||
import tractor
|
|
||||||
import trio
|
import trio
|
||||||
from trio_typing import TaskStatus
|
from trio_typing import TaskStatus
|
||||||
from trio_websocket import (
|
from trio_websocket import (
|
||||||
|
|
@ -167,7 +167,7 @@ async def _reconnect_forever(
|
||||||
|
|
||||||
async def proxy_msgs(
|
async def proxy_msgs(
|
||||||
ws: WebSocketConnection,
|
ws: WebSocketConnection,
|
||||||
rent_cs: trio.CancelScope, # parent cancel scope
|
pcs: trio.CancelScope, # parent cancel scope
|
||||||
):
|
):
|
||||||
'''
|
'''
|
||||||
Receive (under `timeout` deadline) all msgs from from underlying
|
Receive (under `timeout` deadline) all msgs from from underlying
|
||||||
|
|
@ -192,7 +192,7 @@ async def _reconnect_forever(
|
||||||
f'{url} connection bail with:'
|
f'{url} connection bail with:'
|
||||||
)
|
)
|
||||||
await trio.sleep(0.5)
|
await trio.sleep(0.5)
|
||||||
rent_cs.cancel()
|
pcs.cancel()
|
||||||
|
|
||||||
# go back to reonnect loop in parent task
|
# go back to reonnect loop in parent task
|
||||||
return
|
return
|
||||||
|
|
@ -204,7 +204,7 @@ async def _reconnect_forever(
|
||||||
f'{src_mod}\n'
|
f'{src_mod}\n'
|
||||||
'WS feed seems down and slow af.. reconnecting\n'
|
'WS feed seems down and slow af.. reconnecting\n'
|
||||||
)
|
)
|
||||||
rent_cs.cancel()
|
pcs.cancel()
|
||||||
|
|
||||||
# go back to reonnect loop in parent task
|
# go back to reonnect loop in parent task
|
||||||
return
|
return
|
||||||
|
|
@ -228,12 +228,7 @@ async def _reconnect_forever(
|
||||||
nobsws._connected = trio.Event()
|
nobsws._connected = trio.Event()
|
||||||
task_status.started()
|
task_status.started()
|
||||||
|
|
||||||
mc_state: trio._channel.MemoryChannelState = snd._state
|
while not snd._closed:
|
||||||
while (
|
|
||||||
mc_state.open_receive_channels > 0
|
|
||||||
and
|
|
||||||
mc_state.open_send_channels > 0
|
|
||||||
):
|
|
||||||
log.info(
|
log.info(
|
||||||
f'{src_mod}\n'
|
f'{src_mod}\n'
|
||||||
f'{url} trying (RE)CONNECT'
|
f'{url} trying (RE)CONNECT'
|
||||||
|
|
@ -242,11 +237,10 @@ async def _reconnect_forever(
|
||||||
ws: WebSocketConnection
|
ws: WebSocketConnection
|
||||||
try:
|
try:
|
||||||
async with (
|
async with (
|
||||||
|
trio.open_nursery() as n,
|
||||||
open_websocket_url(url) as ws,
|
open_websocket_url(url) as ws,
|
||||||
tractor.trionics.collapse_eg(),
|
|
||||||
trio.open_nursery() as tn,
|
|
||||||
):
|
):
|
||||||
cs = nobsws._cs = tn.cancel_scope
|
cs = nobsws._cs = n.cancel_scope
|
||||||
nobsws._ws = ws
|
nobsws._ws = ws
|
||||||
log.info(
|
log.info(
|
||||||
f'{src_mod}\n'
|
f'{src_mod}\n'
|
||||||
|
|
@ -254,7 +248,7 @@ async def _reconnect_forever(
|
||||||
)
|
)
|
||||||
|
|
||||||
# begin relay loop to forward msgs
|
# begin relay loop to forward msgs
|
||||||
tn.start_soon(
|
n.start_soon(
|
||||||
proxy_msgs,
|
proxy_msgs,
|
||||||
ws,
|
ws,
|
||||||
cs,
|
cs,
|
||||||
|
|
@ -268,7 +262,7 @@ async def _reconnect_forever(
|
||||||
|
|
||||||
# TODO: should we return an explicit sub-cs
|
# TODO: should we return an explicit sub-cs
|
||||||
# from this fixture task?
|
# from this fixture task?
|
||||||
await tn.start(
|
await n.start(
|
||||||
open_fixture,
|
open_fixture,
|
||||||
fixture,
|
fixture,
|
||||||
nobsws,
|
nobsws,
|
||||||
|
|
@ -278,23 +272,11 @@ async def _reconnect_forever(
|
||||||
# to let tasks run **inside** the ws open block above.
|
# to let tasks run **inside** the ws open block above.
|
||||||
nobsws._connected.set()
|
nobsws._connected.set()
|
||||||
await trio.sleep_forever()
|
await trio.sleep_forever()
|
||||||
|
except HandshakeError:
|
||||||
except (
|
|
||||||
HandshakeError,
|
|
||||||
ConnectionRejected,
|
|
||||||
):
|
|
||||||
log.exception('Retrying connection')
|
log.exception('Retrying connection')
|
||||||
await trio.sleep(0.5) # throttle
|
|
||||||
|
|
||||||
except BaseException as _berr:
|
# ws & nursery block ends
|
||||||
berr = _berr
|
|
||||||
log.exception(
|
|
||||||
'Reconnect-attempt failed ??\n'
|
|
||||||
)
|
|
||||||
await trio.sleep(0.2) # throttle
|
|
||||||
raise berr
|
|
||||||
|
|
||||||
#|_ws & nursery block ends
|
|
||||||
nobsws._connected = trio.Event()
|
nobsws._connected = trio.Event()
|
||||||
if cs.cancelled_caught:
|
if cs.cancelled_caught:
|
||||||
log.cancel(
|
log.cancel(
|
||||||
|
|
@ -342,25 +324,21 @@ async def open_autorecon_ws(
|
||||||
connetivity errors, or some user defined recv timeout.
|
connetivity errors, or some user defined recv timeout.
|
||||||
|
|
||||||
You can provide a ``fixture`` async-context-manager which will be
|
You can provide a ``fixture`` async-context-manager which will be
|
||||||
entered/exitted around each connection reset; eg. for
|
entered/exitted around each connection reset; eg. for (re)requesting
|
||||||
(re)requesting subscriptions without requiring streaming setup
|
subscriptions without requiring streaming setup code to rerun.
|
||||||
code to rerun.
|
|
||||||
|
|
||||||
'''
|
'''
|
||||||
snd: trio.MemorySendChannel
|
snd: trio.MemorySendChannel
|
||||||
rcv: trio.MemoryReceiveChannel
|
rcv: trio.MemoryReceiveChannel
|
||||||
snd, rcv = trio.open_memory_channel(616)
|
snd, rcv = trio.open_memory_channel(616)
|
||||||
|
|
||||||
async with (
|
async with trio.open_nursery() as n:
|
||||||
tractor.trionics.collapse_eg(),
|
|
||||||
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(
|
await n.start(
|
||||||
partial(
|
partial(
|
||||||
_reconnect_forever,
|
_reconnect_forever,
|
||||||
url,
|
url,
|
||||||
|
|
@ -373,10 +351,11 @@ async def open_autorecon_ws(
|
||||||
await nobsws._connected.wait()
|
await nobsws._connected.wait()
|
||||||
assert nobsws._cs
|
assert nobsws._cs
|
||||||
assert nobsws.connected()
|
assert nobsws.connected()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
yield nobsws
|
yield nobsws
|
||||||
finally:
|
finally:
|
||||||
tn.cancel_scope.cancel()
|
n.cancel_scope.cancel()
|
||||||
|
|
||||||
|
|
||||||
'''
|
'''
|
||||||
|
|
@ -389,8 +368,8 @@ of msgs over a `NoBsWs`.
|
||||||
class JSONRPCResult(Struct):
|
class JSONRPCResult(Struct):
|
||||||
id: int
|
id: int
|
||||||
jsonrpc: str = '2.0'
|
jsonrpc: str = '2.0'
|
||||||
result: dict|None = None
|
result: Optional[dict] = None
|
||||||
error: dict|None = None
|
error: Optional[dict] = None
|
||||||
|
|
||||||
|
|
||||||
@acm
|
@acm
|
||||||
|
|
|
||||||
|
|
@ -357,9 +357,7 @@ async def allocate_persistent_feed(
|
||||||
|
|
||||||
# yield back control to starting nursery once we receive either
|
# yield back control to starting nursery once we receive either
|
||||||
# some history or a real-time quote.
|
# some history or a real-time quote.
|
||||||
log.info(
|
log.info(f'loading OHLCV history: {fqme}')
|
||||||
f'loading OHLCV history: {fqme!r}\n'
|
|
||||||
)
|
|
||||||
await some_data_ready.wait()
|
await some_data_ready.wait()
|
||||||
|
|
||||||
flume = Flume(
|
flume = Flume(
|
||||||
|
|
|
||||||
|
|
@ -107,22 +107,17 @@ async def open_piker_runtime(
|
||||||
async with (
|
async with (
|
||||||
tractor.open_root_actor(
|
tractor.open_root_actor(
|
||||||
|
|
||||||
# passed through to `open_root_actor`
|
# passed through to ``open_root_actor``
|
||||||
registry_addrs=registry_addrs,
|
registry_addrs=registry_addrs,
|
||||||
name=name,
|
name=name,
|
||||||
start_method=start_method,
|
|
||||||
loglevel=loglevel,
|
loglevel=loglevel,
|
||||||
debug_mode=debug_mode,
|
debug_mode=debug_mode,
|
||||||
|
start_method=start_method,
|
||||||
# XXX NOTE MEMBER DAT der's a perf hit yo!!
|
|
||||||
# https://greenback.readthedocs.io/en/latest/principle.html#performance
|
|
||||||
maybe_enable_greenback=True,
|
|
||||||
|
|
||||||
# TODO: eventually we should be able to avoid
|
# TODO: eventually we should be able to avoid
|
||||||
# having the root have more then permissions to
|
# having the root have more then permissions to
|
||||||
# spawn other specialized daemons I think?
|
# spawn other specialized daemons I think?
|
||||||
enable_modules=enable_modules,
|
enable_modules=enable_modules,
|
||||||
hide_tb=False,
|
|
||||||
|
|
||||||
**tractor_kwargs,
|
**tractor_kwargs,
|
||||||
) as actor,
|
) as actor,
|
||||||
|
|
@ -262,10 +257,7 @@ async def maybe_open_pikerd(
|
||||||
loglevel: str | None = None,
|
loglevel: str | None = None,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
|
|
||||||
) -> (
|
) -> tractor._portal.Portal | ClassVar[Services]:
|
||||||
tractor._portal.Portal
|
|
||||||
|ClassVar[Services]
|
|
||||||
):
|
|
||||||
'''
|
'''
|
||||||
If no ``pikerd`` daemon-root-actor can be found start it and
|
If no ``pikerd`` daemon-root-actor can be found start it and
|
||||||
yield up (we should probably figure out returning a portal to self
|
yield up (we should probably figure out returning a portal to self
|
||||||
|
|
@ -290,11 +282,10 @@ async def maybe_open_pikerd(
|
||||||
|
|
||||||
registry_addrs: list[tuple[str, int]] = (
|
registry_addrs: list[tuple[str, int]] = (
|
||||||
registry_addrs
|
registry_addrs
|
||||||
or
|
or [_default_reg_addr]
|
||||||
[_default_reg_addr]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
pikerd_portal: tractor.Portal|None
|
pikerd_portal: tractor.Portal | None
|
||||||
async with (
|
async with (
|
||||||
open_piker_runtime(
|
open_piker_runtime(
|
||||||
name=query_name,
|
name=query_name,
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@ from contextlib import (
|
||||||
)
|
)
|
||||||
|
|
||||||
import tractor
|
import tractor
|
||||||
from trio.lowlevel import current_task
|
|
||||||
|
|
||||||
from ._util import (
|
from ._util import (
|
||||||
log, # sub-sys logger
|
log, # sub-sys logger
|
||||||
|
|
@ -71,84 +70,69 @@ async def maybe_spawn_daemon(
|
||||||
lock = Services.locks[service_name]
|
lock = Services.locks[service_name]
|
||||||
await lock.acquire()
|
await lock.acquire()
|
||||||
|
|
||||||
try:
|
async with find_service(
|
||||||
async with find_service(
|
service_name,
|
||||||
service_name,
|
registry_addrs=[('127.0.0.1', 6116)],
|
||||||
registry_addrs=[('127.0.0.1', 6116)],
|
) as portal:
|
||||||
) as portal:
|
if portal is not None:
|
||||||
if portal is not None:
|
|
||||||
lock.release()
|
|
||||||
yield portal
|
|
||||||
return
|
|
||||||
|
|
||||||
log.warning(
|
|
||||||
f"Couldn't find any existing {service_name}\n"
|
|
||||||
'Attempting to spawn new daemon-service..'
|
|
||||||
)
|
|
||||||
|
|
||||||
# ask root ``pikerd`` daemon to spawn the daemon we need if
|
|
||||||
# pikerd is not live we now become the root of the
|
|
||||||
# process tree
|
|
||||||
async with maybe_open_pikerd(
|
|
||||||
loglevel=loglevel,
|
|
||||||
**pikerd_kwargs,
|
|
||||||
|
|
||||||
) as pikerd_portal:
|
|
||||||
|
|
||||||
# we are the root and thus are `pikerd`
|
|
||||||
# so spawn the target service directly by calling
|
|
||||||
# the provided target routine.
|
|
||||||
# XXX: this assumes that the target is well formed and will
|
|
||||||
# do the right things to setup both a sub-actor **and** call
|
|
||||||
# the ``_Services`` api from above to start the top level
|
|
||||||
# service task for that actor.
|
|
||||||
started: bool
|
|
||||||
if pikerd_portal is None:
|
|
||||||
started = await service_task_target(
|
|
||||||
loglevel=loglevel,
|
|
||||||
**spawn_args,
|
|
||||||
)
|
|
||||||
|
|
||||||
else:
|
|
||||||
# request a remote `pikerd` (service manager) to start the
|
|
||||||
# target daemon-task, the target can't return
|
|
||||||
# a non-serializable value since it is expected that service
|
|
||||||
# starting is non-blocking and the target task will persist
|
|
||||||
# running "under" or "within" the `pikerd` actor tree after
|
|
||||||
# the questing client disconnects. in other words this
|
|
||||||
# spawns a persistent daemon actor that continues to live
|
|
||||||
# for the lifespan of whatever the service manager inside
|
|
||||||
# `pikerd` says it should.
|
|
||||||
started = await pikerd_portal.run(
|
|
||||||
service_task_target,
|
|
||||||
loglevel=loglevel,
|
|
||||||
**spawn_args,
|
|
||||||
)
|
|
||||||
|
|
||||||
if started:
|
|
||||||
log.info(f'Service {service_name} started!')
|
|
||||||
|
|
||||||
# block until we can discover (by IPC connection) to the newly
|
|
||||||
# spawned daemon-actor and then deliver the portal to the
|
|
||||||
# caller.
|
|
||||||
async with tractor.wait_for_actor(service_name) as portal:
|
|
||||||
lock.release()
|
|
||||||
yield portal
|
|
||||||
await portal.cancel_actor()
|
|
||||||
|
|
||||||
except BaseException as _err:
|
|
||||||
err = _err
|
|
||||||
if (
|
|
||||||
lock.locked()
|
|
||||||
and
|
|
||||||
lock.statistics().owner is current_task()
|
|
||||||
):
|
|
||||||
log.exception(
|
|
||||||
f'Releasing stale lock after crash..?'
|
|
||||||
f'{err!r}\n'
|
|
||||||
)
|
|
||||||
lock.release()
|
lock.release()
|
||||||
raise err
|
yield portal
|
||||||
|
return
|
||||||
|
|
||||||
|
log.warning(
|
||||||
|
f"Couldn't find any existing {service_name}\n"
|
||||||
|
'Attempting to spawn new daemon-service..'
|
||||||
|
)
|
||||||
|
|
||||||
|
# ask root ``pikerd`` daemon to spawn the daemon we need if
|
||||||
|
# pikerd is not live we now become the root of the
|
||||||
|
# process tree
|
||||||
|
async with maybe_open_pikerd(
|
||||||
|
loglevel=loglevel,
|
||||||
|
**pikerd_kwargs,
|
||||||
|
|
||||||
|
) as pikerd_portal:
|
||||||
|
|
||||||
|
# we are the root and thus are `pikerd`
|
||||||
|
# so spawn the target service directly by calling
|
||||||
|
# the provided target routine.
|
||||||
|
# XXX: this assumes that the target is well formed and will
|
||||||
|
# do the right things to setup both a sub-actor **and** call
|
||||||
|
# the ``_Services`` api from above to start the top level
|
||||||
|
# service task for that actor.
|
||||||
|
started: bool
|
||||||
|
if pikerd_portal is None:
|
||||||
|
started = await service_task_target(
|
||||||
|
loglevel=loglevel,
|
||||||
|
**spawn_args,
|
||||||
|
)
|
||||||
|
|
||||||
|
else:
|
||||||
|
# request a remote `pikerd` (service manager) to start the
|
||||||
|
# target daemon-task, the target can't return
|
||||||
|
# a non-serializable value since it is expected that service
|
||||||
|
# starting is non-blocking and the target task will persist
|
||||||
|
# running "under" or "within" the `pikerd` actor tree after
|
||||||
|
# the questing client disconnects. in other words this
|
||||||
|
# spawns a persistent daemon actor that continues to live
|
||||||
|
# for the lifespan of whatever the service manager inside
|
||||||
|
# `pikerd` says it should.
|
||||||
|
started = await pikerd_portal.run(
|
||||||
|
service_task_target,
|
||||||
|
loglevel=loglevel,
|
||||||
|
**spawn_args,
|
||||||
|
)
|
||||||
|
|
||||||
|
if started:
|
||||||
|
log.info(f'Service {service_name} started!')
|
||||||
|
|
||||||
|
# block until we can discover (by IPC connection) to the newly
|
||||||
|
# spawned daemon-actor and then deliver the portal to the
|
||||||
|
# caller.
|
||||||
|
async with tractor.wait_for_actor(service_name) as portal:
|
||||||
|
lock.release()
|
||||||
|
yield portal
|
||||||
|
await portal.cancel_actor()
|
||||||
|
|
||||||
|
|
||||||
async def spawn_emsd(
|
async def spawn_emsd(
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ class Services:
|
||||||
# wait on any context's return value
|
# wait on any context's return value
|
||||||
# and any final portal result from the
|
# and any final portal result from the
|
||||||
# sub-actor.
|
# sub-actor.
|
||||||
ctx_res: Any = await ctx.wait_for_result()
|
ctx_res: Any = await ctx.result()
|
||||||
|
|
||||||
# NOTE: blocks indefinitely until cancelled
|
# NOTE: blocks indefinitely until cancelled
|
||||||
# either by error from the target context
|
# either by error from the target context
|
||||||
|
|
|
||||||
|
|
@ -101,15 +101,13 @@ async def open_registry(
|
||||||
|
|
||||||
if (
|
if (
|
||||||
not tractor.is_root_process()
|
not tractor.is_root_process()
|
||||||
and
|
and not Registry.addrs
|
||||||
not Registry.addrs
|
|
||||||
):
|
):
|
||||||
Registry.addrs.extend(actor.reg_addrs)
|
Registry.addrs.extend(actor.reg_addrs)
|
||||||
|
|
||||||
if (
|
if (
|
||||||
ensure_exists
|
ensure_exists
|
||||||
and
|
and not Registry.addrs
|
||||||
not Registry.addrs
|
|
||||||
):
|
):
|
||||||
raise RuntimeError(
|
raise RuntimeError(
|
||||||
f"`{uid}` registry should already exist but doesn't?"
|
f"`{uid}` registry should already exist but doesn't?"
|
||||||
|
|
@ -148,7 +146,7 @@ async def find_service(
|
||||||
| list[Portal]
|
| list[Portal]
|
||||||
| None
|
| None
|
||||||
):
|
):
|
||||||
# try:
|
|
||||||
reg_addrs: list[tuple[str, int]]
|
reg_addrs: list[tuple[str, int]]
|
||||||
async with open_registry(
|
async with open_registry(
|
||||||
addrs=(
|
addrs=(
|
||||||
|
|
@ -159,39 +157,22 @@ async def find_service(
|
||||||
or Registry.addrs
|
or Registry.addrs
|
||||||
),
|
),
|
||||||
) as reg_addrs:
|
) as reg_addrs:
|
||||||
|
log.info(f'Scanning for service `{service_name}`')
|
||||||
|
|
||||||
log.info(
|
maybe_portals: list[Portal] | Portal | None
|
||||||
f'Scanning for service {service_name!r}'
|
|
||||||
)
|
|
||||||
|
|
||||||
# attach to existing daemon by name if possible
|
# attach to existing daemon by name if possible
|
||||||
maybe_portals: list[Portal]|Portal|None
|
|
||||||
async with tractor.find_actor(
|
async with tractor.find_actor(
|
||||||
service_name,
|
service_name,
|
||||||
registry_addrs=reg_addrs,
|
registry_addrs=reg_addrs,
|
||||||
only_first=first_only, # if set only returns single ref
|
only_first=first_only, # if set only returns single ref
|
||||||
) as maybe_portals:
|
) as maybe_portals:
|
||||||
if not maybe_portals:
|
if not maybe_portals:
|
||||||
# log.info(
|
|
||||||
print(
|
|
||||||
f'Could NOT find service {service_name!r} -> {maybe_portals!r}'
|
|
||||||
)
|
|
||||||
yield None
|
yield None
|
||||||
return
|
return
|
||||||
|
|
||||||
# log.info(
|
|
||||||
print(
|
|
||||||
f'Found service {service_name!r} -> {maybe_portals}'
|
|
||||||
)
|
|
||||||
yield maybe_portals
|
yield maybe_portals
|
||||||
|
|
||||||
# except BaseException as _berr:
|
|
||||||
# berr = _berr
|
|
||||||
# log.exception(
|
|
||||||
# 'tractor.find_actor() failed with,\n'
|
|
||||||
# )
|
|
||||||
# raise berr
|
|
||||||
|
|
||||||
|
|
||||||
async def check_for_service(
|
async def check_for_service(
|
||||||
service_name: str,
|
service_name: str,
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
# 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
|
from __future__ import annotations
|
||||||
|
|
@ -32,7 +32,6 @@ from typing import (
|
||||||
)
|
)
|
||||||
|
|
||||||
import tractor
|
import tractor
|
||||||
import trio
|
|
||||||
from tractor import trionics
|
from tractor import trionics
|
||||||
from tractor import (
|
from tractor import (
|
||||||
Portal,
|
Portal,
|
||||||
|
|
@ -317,9 +316,7 @@ class AnnotCtl(Struct):
|
||||||
)
|
)
|
||||||
yield aid
|
yield aid
|
||||||
finally:
|
finally:
|
||||||
# async ipc send op
|
await self.remove(aid)
|
||||||
with trio.CancelScope(shield=True):
|
|
||||||
await self.remove(aid)
|
|
||||||
|
|
||||||
async def redraw(
|
async def redraw(
|
||||||
self,
|
self,
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,7 @@
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
qompleterz: embeddable search and complete using trio, Qt and
|
qompleterz: embeddable search and complete using trio, Qt and rapidfuzz.
|
||||||
rapidfuzz.
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
@ -47,7 +46,6 @@ import time
|
||||||
from pprint import pformat
|
from pprint import pformat
|
||||||
|
|
||||||
from rapidfuzz import process as fuzzy
|
from rapidfuzz import process as fuzzy
|
||||||
import tractor
|
|
||||||
import trio
|
import trio
|
||||||
from trio_typing import TaskStatus
|
from trio_typing import TaskStatus
|
||||||
|
|
||||||
|
|
@ -55,7 +53,7 @@ from piker.ui.qt import (
|
||||||
size_policy,
|
size_policy,
|
||||||
align_flag,
|
align_flag,
|
||||||
Qt,
|
Qt,
|
||||||
# QtCore,
|
QtCore,
|
||||||
QtWidgets,
|
QtWidgets,
|
||||||
QModelIndex,
|
QModelIndex,
|
||||||
QItemSelectionModel,
|
QItemSelectionModel,
|
||||||
|
|
@ -922,10 +920,7 @@ async def fill_results(
|
||||||
|
|
||||||
# issue multi-provider fan-out search request and place
|
# issue multi-provider fan-out search request and place
|
||||||
# "searching.." statuses on outstanding results providers
|
# "searching.." statuses on outstanding results providers
|
||||||
async with (
|
async with trio.open_nursery() as n:
|
||||||
tractor.trionics.collapse_eg(),
|
|
||||||
trio.open_nursery() as tn
|
|
||||||
):
|
|
||||||
|
|
||||||
for provider, (search, pause) in (
|
for provider, (search, pause) in (
|
||||||
_searcher_cache.copy().items()
|
_searcher_cache.copy().items()
|
||||||
|
|
@ -949,7 +944,7 @@ async def fill_results(
|
||||||
status_field='-> searchin..',
|
status_field='-> searchin..',
|
||||||
)
|
)
|
||||||
|
|
||||||
await tn.start(
|
await n.start(
|
||||||
pack_matches,
|
pack_matches,
|
||||||
view,
|
view,
|
||||||
has_results,
|
has_results,
|
||||||
|
|
@ -1009,14 +1004,12 @@ async def handle_keyboard_input(
|
||||||
view.set_font_size(searchbar.dpi_font.px_size)
|
view.set_font_size(searchbar.dpi_font.px_size)
|
||||||
send, recv = trio.open_memory_channel(616)
|
send, recv = trio.open_memory_channel(616)
|
||||||
|
|
||||||
async with (
|
async with trio.open_nursery() as n:
|
||||||
tractor.trionics.collapse_eg(), # needed?
|
|
||||||
trio.open_nursery() as tn
|
|
||||||
):
|
|
||||||
# start a background multi-searcher task which receives
|
# start a background multi-searcher task which receives
|
||||||
# patterns relayed from this keyboard input handler and
|
# patterns relayed from this keyboard input handler and
|
||||||
# async updates the completer view's results.
|
# async updates the completer view's results.
|
||||||
tn.start_soon(
|
n.start_soon(
|
||||||
partial(
|
partial(
|
||||||
fill_results,
|
fill_results,
|
||||||
searchw,
|
searchw,
|
||||||
|
|
|
||||||
|
|
@ -555,13 +555,14 @@ class OrderMode:
|
||||||
|
|
||||||
def on_fill(
|
def on_fill(
|
||||||
self,
|
self,
|
||||||
|
|
||||||
uuid: str,
|
uuid: str,
|
||||||
price: float,
|
price: float,
|
||||||
time_s: float,
|
time_s: float,
|
||||||
|
|
||||||
pointing: str | None = None,
|
pointing: str | None = None,
|
||||||
|
|
||||||
) -> bool:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Fill msg handler.
|
Fill msg handler.
|
||||||
|
|
||||||
|
|
@ -574,83 +575,60 @@ class OrderMode:
|
||||||
- update fill bar size
|
- 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
|
lines = dialog.lines
|
||||||
chart = self.chart
|
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
|
# 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(
|
def on_cancel(
|
||||||
self,
|
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(
|
log.warning(
|
||||||
f'Received cancel for unsubmitted order {pformat(msg)}'
|
f'Received cancel for unsubmitted order {pformat(msg)}'
|
||||||
)
|
)
|
||||||
return False
|
|
||||||
|
|
||||||
# remove GUI line, show cursor.
|
|
||||||
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[str]:
|
def cancel_orders_under_cursor(self) -> list[str]:
|
||||||
return self.cancel_orders(
|
return self.cancel_orders(
|
||||||
|
|
@ -1079,23 +1057,13 @@ async def process_trade_msg(
|
||||||
if name in (
|
if name in (
|
||||||
'position',
|
'position',
|
||||||
):
|
):
|
||||||
mkt: MktPair = mode.chart.linked.mkt
|
sym: MktPair = mode.chart.linked.mkt
|
||||||
pp_msg_symbol = msg['symbol'].lower()
|
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 (
|
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
|
pp_msg_symbol == fqme
|
||||||
or
|
or pp_msg_symbol == fqme.removesuffix(f'.{broker}')
|
||||||
pp_msg_symbol == fqme.removesuffix(f'.{broker}')
|
|
||||||
):
|
):
|
||||||
log.info(
|
log.info(
|
||||||
f'Loading position for `{fqme}`:\n'
|
f'Loading position for `{fqme}`:\n'
|
||||||
|
|
@ -1118,7 +1086,7 @@ async def process_trade_msg(
|
||||||
return
|
return
|
||||||
|
|
||||||
msg = Status(**msg)
|
msg = Status(**msg)
|
||||||
# resp: str = msg.resp
|
resp = msg.resp
|
||||||
oid = msg.oid
|
oid = msg.oid
|
||||||
dialog: Dialog = mode.dialogs.get(oid)
|
dialog: Dialog = mode.dialogs.get(oid)
|
||||||
|
|
||||||
|
|
@ -1182,33 +1150,20 @@ async def process_trade_msg(
|
||||||
mode.on_submit(oid)
|
mode.on_submit(oid)
|
||||||
|
|
||||||
case Status(resp='error'):
|
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:
|
# do all the things for a cancel:
|
||||||
# - drop order-msg dialog from client table
|
# - drop order-msg dialog from client table
|
||||||
# - delete level line from view
|
# - delete level line from view
|
||||||
mode.on_cancel(oid)
|
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'):
|
case Status(resp='canceled'):
|
||||||
# delete level line from view
|
# delete level line from view
|
||||||
mode.on_cancel(oid)
|
mode.on_cancel(oid)
|
||||||
|
|
@ -1223,10 +1178,10 @@ async def process_trade_msg(
|
||||||
# TODO: UX for a "pending" clear/live order
|
# TODO: UX for a "pending" clear/live order
|
||||||
log.info(f'Dark order triggered for {fmtmsg}')
|
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(
|
case Status(
|
||||||
resp='triggered',
|
resp='triggered',
|
||||||
|
# TODO: do the struct-msg version, blah blah..
|
||||||
|
# req=Order(exec_mode='live', action='alert') as req,
|
||||||
req={
|
req={
|
||||||
'exec_mode': 'live',
|
'exec_mode': 'live',
|
||||||
'action': 'alert',
|
'action': 'alert',
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,4 @@
|
||||||
# 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/>.
|
|
||||||
|
|
||||||
'''
|
|
||||||
A per-display, DPI (scaling) info dumper.
|
|
||||||
|
|
||||||
Resource list for mucking with DPIs on multiple screens:
|
Resource list for mucking with DPIs on multiple screens:
|
||||||
|
|
||||||
- https://stackoverflow.com/questions/42141354/convert-pixel-size-to-point-size-for-fonts-on-multiple-platforms
|
- https://stackoverflow.com/questions/42141354/convert-pixel-size-to-point-size-for-fonts-on-multiple-platforms
|
||||||
|
|
@ -30,86 +12,89 @@ Resource list for mucking with DPIs on multiple screens:
|
||||||
- https://stackoverflow.com/questions/16561879/what-is-the-difference-between-logicaldpix-and-physicaldpix-in-qt
|
- https://stackoverflow.com/questions/16561879/what-is-the-difference-between-logicaldpix-and-physicaldpix-in-qt
|
||||||
- https://doc.qt.io/qt-5/qguiapplication.html#screenAt
|
- https://doc.qt.io/qt-5/qguiapplication.html#screenAt
|
||||||
|
|
||||||
'''
|
"""
|
||||||
|
|
||||||
from pyqtgraph import QtGui
|
from pyqtgraph import QtGui
|
||||||
from PyQt6 import (
|
from PyQt5.QtCore import (
|
||||||
QtCore,
|
Qt, QCoreApplication
|
||||||
QtWidgets,
|
|
||||||
)
|
|
||||||
from PyQt6.QtCore import (
|
|
||||||
Qt,
|
|
||||||
QCoreApplication,
|
|
||||||
QSize,
|
|
||||||
QRect,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Proper high DPI scaling is available in Qt >= 5.6.0. This attibute
|
# Proper high DPI scaling is available in Qt >= 5.6.0. This attibute
|
||||||
# must be set before creating the application
|
# must be set before creating the application
|
||||||
if hasattr(Qt, 'AA_EnableHighDpiScaling'):
|
if hasattr(Qt, 'AA_EnableHighDpiScaling'):
|
||||||
QCoreApplication.setAttribute(
|
QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
|
||||||
Qt.AA_EnableHighDpiScaling,
|
|
||||||
True,
|
|
||||||
)
|
|
||||||
|
|
||||||
if hasattr(Qt, 'AA_UseHighDpiPixmaps'):
|
if hasattr(Qt, 'AA_UseHighDpiPixmaps'):
|
||||||
QCoreApplication.setAttribute(
|
QCoreApplication.setAttribute(Qt.AA_UseHighDpiPixmaps, True)
|
||||||
Qt.AA_UseHighDpiPixmaps,
|
|
||||||
True,
|
|
||||||
)
|
|
||||||
|
|
||||||
app = QtWidgets.QApplication([])
|
|
||||||
window = QtWidgets.QMainWindow()
|
app = QtGui.QApplication([])
|
||||||
main_widget = QtWidgets.QWidget()
|
window = QtGui.QMainWindow()
|
||||||
|
main_widget = QtGui.QWidget()
|
||||||
window.setCentralWidget(main_widget)
|
window.setCentralWidget(main_widget)
|
||||||
window.show()
|
window.show()
|
||||||
|
|
||||||
pxr: float = main_widget.devicePixelRatioF()
|
pxr = main_widget.devicePixelRatioF()
|
||||||
|
|
||||||
# explicitly get main widget and primary displays
|
# screen_num = app.desktop().screenNumber()
|
||||||
current_screen: QtGui.QScreen = app.screenAt(
|
# screen = app.screens()[screen_num]
|
||||||
main_widget.geometry().center()
|
|
||||||
|
screen = app.screenAt(main_widget.geometry().center())
|
||||||
|
|
||||||
|
name = screen.name()
|
||||||
|
size = screen.size()
|
||||||
|
geo = screen.availableGeometry()
|
||||||
|
phydpi = screen.physicalDotsPerInch()
|
||||||
|
logdpi = screen.logicalDotsPerInch()
|
||||||
|
|
||||||
|
print(
|
||||||
|
# f'screen number: {screen_num}\n',
|
||||||
|
f'screen name: {name}\n'
|
||||||
|
f'screen size: {size}\n'
|
||||||
|
f'screen geometry: {geo}\n\n'
|
||||||
|
f'devicePixelRationF(): {pxr}\n'
|
||||||
|
f'physical dpi: {phydpi}\n'
|
||||||
|
f'logical dpi: {logdpi}\n'
|
||||||
)
|
)
|
||||||
primary_screen: QtGui.QScreen = app.primaryScreen()
|
|
||||||
|
|
||||||
screen: QtGui.QScreen
|
print('-'*50)
|
||||||
for screen in app.screens():
|
|
||||||
name: str = screen.name()
|
|
||||||
model: str = screen.model().rstrip()
|
|
||||||
size: QSize = screen.size()
|
|
||||||
geo: QRect = screen.availableGeometry()
|
|
||||||
phydpi: float = screen.physicalDotsPerInch()
|
|
||||||
logdpi: float = screen.logicalDotsPerInch()
|
|
||||||
is_primary: bool = screen is primary_screen
|
|
||||||
is_current: bool = screen is current_screen
|
|
||||||
|
|
||||||
print(
|
screen = app.primaryScreen()
|
||||||
f'------ screen name: {name} ------\n'
|
|
||||||
f'|_primary: {is_primary}\n'
|
|
||||||
f' _current: {is_current}\n'
|
|
||||||
f' _model: {model}\n'
|
|
||||||
f' _screen size: {size}\n'
|
|
||||||
f' _screen geometry: {geo}\n'
|
|
||||||
f' _devicePixelRationF(): {pxr}\n'
|
|
||||||
f' _physical dpi: {phydpi}\n'
|
|
||||||
f' _logical dpi: {logdpi}\n'
|
|
||||||
)
|
|
||||||
|
|
||||||
# app-wide font info
|
name = screen.name()
|
||||||
|
size = screen.size()
|
||||||
|
geo = screen.availableGeometry()
|
||||||
|
phydpi = screen.physicalDotsPerInch()
|
||||||
|
logdpi = screen.logicalDotsPerInch()
|
||||||
|
|
||||||
|
print(
|
||||||
|
# f'screen number: {screen_num}\n',
|
||||||
|
f'screen name: {name}\n'
|
||||||
|
f'screen size: {size}\n'
|
||||||
|
f'screen geometry: {geo}\n\n'
|
||||||
|
f'devicePixelRationF(): {pxr}\n'
|
||||||
|
f'physical dpi: {phydpi}\n'
|
||||||
|
f'logical dpi: {logdpi}\n'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# app-wide font
|
||||||
font = QtGui.QFont("Hack")
|
font = QtGui.QFont("Hack")
|
||||||
# use pixel size to be cross-resolution compatible?
|
# use pixel size to be cross-resolution compatible?
|
||||||
font.setPixelSize(6)
|
font.setPixelSize(6)
|
||||||
|
|
||||||
fm = QtGui.QFontMetrics(font)
|
|
||||||
fontdpi: float = fm.fontDpi()
|
|
||||||
font_h: int = fm.height()
|
|
||||||
|
|
||||||
string: str = '10000'
|
fm = QtGui.QFontMetrics(font)
|
||||||
str_br: QtCore.QRect = fm.boundingRect(string)
|
fontdpi = fm.fontDpi()
|
||||||
str_w: int = str_br.width()
|
font_h = fm.height()
|
||||||
|
|
||||||
|
string = '10000'
|
||||||
|
str_br = fm.boundingRect(string)
|
||||||
|
str_w = str_br.width()
|
||||||
|
|
||||||
|
|
||||||
print(
|
print(
|
||||||
f'------ global font settings ------\n'
|
# f'screen number: {screen_num}\n',
|
||||||
f'font dpi: {fontdpi}\n'
|
f'font dpi: {fontdpi}\n'
|
||||||
f'font height: {font_h}\n'
|
f'font height: {font_h}\n'
|
||||||
f'string bounding rect: {str_br}\n'
|
f'string bounding rect: {str_br}\n'
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,6 @@ from piker.service import (
|
||||||
from piker.log import get_console_log
|
from piker.log import get_console_log
|
||||||
|
|
||||||
|
|
||||||
# include `tractor`'s built-in fixtures!
|
|
||||||
pytest_plugins: tuple[str] = (
|
|
||||||
"tractor._testing.pytest",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def pytest_addoption(parser):
|
def pytest_addoption(parser):
|
||||||
parser.addoption("--ll", action="store", dest='loglevel',
|
parser.addoption("--ll", action="store", dest='loglevel',
|
||||||
default=None, help="logging level to set when testing")
|
default=None, help="logging level to set when testing")
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,12 @@ from piker import config
|
||||||
from piker.accounting import (
|
from piker.accounting import (
|
||||||
Account,
|
Account,
|
||||||
calc,
|
calc,
|
||||||
open_account,
|
|
||||||
load_account,
|
|
||||||
load_account_from_ledger,
|
|
||||||
open_trade_ledger,
|
|
||||||
Position,
|
Position,
|
||||||
TransactionLedger,
|
TransactionLedger,
|
||||||
|
open_trade_ledger,
|
||||||
|
load_account,
|
||||||
|
load_account_from_ledger,
|
||||||
)
|
)
|
||||||
import tractor
|
|
||||||
|
|
||||||
|
|
||||||
def test_root_conf_networking_section(
|
def test_root_conf_networking_section(
|
||||||
|
|
@ -55,17 +53,12 @@ def test_account_file_default_empty(
|
||||||
)
|
)
|
||||||
def test_paper_ledger_position_calcs(
|
def test_paper_ledger_position_calcs(
|
||||||
fq_acnt: tuple[str, str],
|
fq_acnt: tuple[str, str],
|
||||||
debug_mode: bool,
|
|
||||||
):
|
):
|
||||||
broker: str
|
broker: str
|
||||||
acnt_name: str
|
acnt_name: str
|
||||||
broker, acnt_name = fq_acnt
|
broker, acnt_name = fq_acnt
|
||||||
|
|
||||||
accounts_path: Path = (
|
accounts_path: Path = config.repodir() / 'tests' / '_inputs'
|
||||||
config.repodir()
|
|
||||||
/ 'tests'
|
|
||||||
/ '_inputs' # tests-local-subdir
|
|
||||||
)
|
|
||||||
|
|
||||||
ldr: TransactionLedger
|
ldr: TransactionLedger
|
||||||
with (
|
with (
|
||||||
|
|
@ -84,7 +77,6 @@ def test_paper_ledger_position_calcs(
|
||||||
ledger=ldr,
|
ledger=ldr,
|
||||||
|
|
||||||
_fp=accounts_path,
|
_fp=accounts_path,
|
||||||
debug_mode=debug_mode,
|
|
||||||
|
|
||||||
) as (dfs, ledger),
|
) as (dfs, ledger),
|
||||||
|
|
||||||
|
|
@ -110,87 +102,3 @@ def test_paper_ledger_position_calcs(
|
||||||
df = dfs[xrp]
|
df = dfs[xrp]
|
||||||
assert df['cumsize'][-1] == 0
|
assert df['cumsize'][-1] == 0
|
||||||
assert pos.cumsize == 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.
|
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ from piker.accounting import (
|
||||||
unpack_fqme,
|
unpack_fqme,
|
||||||
)
|
)
|
||||||
from piker.accounting import (
|
from piker.accounting import (
|
||||||
open_account,
|
open_pps,
|
||||||
Position,
|
Position,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -136,7 +136,7 @@ def load_and_check_pos(
|
||||||
|
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
||||||
with open_account(ppmsg.broker, ppmsg.account) as table:
|
with open_pps(ppmsg.broker, ppmsg.account) as table:
|
||||||
|
|
||||||
if ppmsg.size == 0:
|
if ppmsg.size == 0:
|
||||||
assert ppmsg.symbol not in table.pps
|
assert ppmsg.symbol not in table.pps
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue