pikers
/
piker
3
0
Fork 0
Code Issues 5 Pull Requests 7 Packages Projects Releases Wiki Activity

Adjust `.ui` modules to new set-style "optional" annots

log_linearized_curve_overlays
Tyler Goodlet 2023-02-21 09:14:26 -05:00
parent 54ecb0990f
commit 753e991dae
21 changed files with 127 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
piker/ui/_annotate.py
View File

@ -18,7 +18,7 @@
Annotations for ur faces. Annotations for ur faces.
""" """
from typing import Callable, Optional from typing import Callable
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from PyQt5.QtCore import QPointF, QRectF from PyQt5.QtCore import QPointF, QRectF
@ -105,7 +105,7 @@ class LevelMarker(QGraphicsPathItem):
get_level: Callable[..., float], get_level: Callable[..., float],
size: float = 20, size: float = 20,
keep_in_view: bool = True, keep_in_view: bool = True,
on_paint: Optional[Callable] = None, on_paint: Callable | None = None,
) -> None: ) -> None:

11
piker/ui/_axes.py
View File

@ -20,7 +20,7 @@ Chart axes graphics and behavior.
""" """
from __future__ import annotations from __future__ import annotations
from functools import lru_cache from functools import lru_cache
from typing import Optional, Callable from typing import Callable
from math import floor from math import floor
import numpy as np import numpy as np
@ -60,7 +60,8 @@ class Axis(pg.AxisItem):
**kwargs **kwargs
) )
# XXX: pretty sure this makes things slower # XXX: pretty sure this makes things slower!
# no idea why given we only move labels for the most part?
# self.setCacheMode(QtWidgets.QGraphicsItem.DeviceCoordinateCache) # self.setCacheMode(QtWidgets.QGraphicsItem.DeviceCoordinateCache)
self.pi = plotitem self.pi = plotitem
@ -190,7 +191,7 @@ class PriceAxis(Axis):
*args, *args,
min_tick: int = 2, min_tick: int = 2,
title: str = '', title: str = '',
formatter: Optional[Callable[[float], str]] = None, formatter: Callable[[float], str] | None = None,
**kwargs **kwargs
) -> None: ) -> None:
@ -202,8 +203,8 @@ class PriceAxis(Axis):
def set_title( def set_title(
self, self,
title: str, title: str,
view: Optional[ChartView] = None, view: ChartView | None = None,
color: Optional[str] = None, color: str | None = None,
) -> Label: ) -> Label:
''' '''

45
piker/ui/_chart.py
View File

@ -21,7 +21,6 @@ High level chart-widget apis.
from __future__ import annotations from __future__ import annotations
from typing import ( from typing import (
Iterator, Iterator,
Optional,
TYPE_CHECKING, TYPE_CHECKING,
) )
@ -102,7 +101,7 @@ class GodWidget(QWidget):
super().__init__(parent) super().__init__(parent)
self.search: Optional[SearchWidget] = None self.search: SearchWidget | None = None
self.hbox = QHBoxLayout(self) self.hbox = QHBoxLayout(self)
self.hbox.setContentsMargins(0, 0, 0, 0) self.hbox.setContentsMargins(0, 0, 0, 0)
@ -121,9 +120,9 @@ class GodWidget(QWidget):
tuple[LinkedSplits, LinkedSplits], tuple[LinkedSplits, LinkedSplits],
] = {} ] = {}
self.hist_linked: Optional[LinkedSplits] = None self.hist_linked: LinkedSplits | None = None
self.rt_linked: Optional[LinkedSplits] = None self.rt_linked: LinkedSplits | None = None
self._active_cursor: Optional[Cursor] = None self._active_cursor: Cursor | None = None
# assigned in the startup func `_async_main()` # assigned in the startup func `_async_main()`
self._root_n: trio.Nursery = None self._root_n: trio.Nursery = None
@ -367,7 +366,7 @@ class ChartnPane(QFrame):
''' '''
sidepane: FieldsForm | SearchWidget sidepane: FieldsForm | SearchWidget
hbox: QHBoxLayout hbox: QHBoxLayout
chart: Optional[ChartPlotWidget] = None chart: ChartPlotWidget | None = None
def __init__( def __init__(
self, self,
@ -445,7 +444,7 @@ class LinkedSplits(QWidget):
# chart-local graphics state that can be passed to # chart-local graphics state that can be passed to
# a ``graphic_update_cycle()`` call by any task wishing to # a ``graphic_update_cycle()`` call by any task wishing to
# update the UI for a given "chart instance". # update the UI for a given "chart instance".
self.display_state: Optional[DisplayState] = None self.display_state: DisplayState | None = None
self._symbol: Symbol = None self._symbol: Symbol = None
@ -475,7 +474,7 @@ class LinkedSplits(QWidget):
def set_split_sizes( def set_split_sizes(
self, self,
prop: Optional[float] = None, prop: float | None = None,
) -> None: ) -> None:
''' '''
@ -569,11 +568,11 @@ class LinkedSplits(QWidget):
shm: ShmArray, shm: ShmArray,
flume: Flume, flume: Flume,
array_key: Optional[str] = None, array_key: str | None = None,
style: str = 'line', style: str = 'line',
_is_main: bool = False, _is_main: bool = False,
sidepane: Optional[QWidget] = None, sidepane: QWidget | None = None,
draw_kwargs: dict = {}, draw_kwargs: dict = {},
**cpw_kwargs, **cpw_kwargs,
@ -789,7 +788,7 @@ class LinkedSplits(QWidget):
def resize_sidepanes( def resize_sidepanes(
self, self,
from_linked: Optional[LinkedSplits] = None, from_linked: LinkedSplits | None = None,
) -> None: ) -> None:
''' '''
@ -857,7 +856,7 @@ class ChartPlotWidget(pg.PlotWidget):
# TODO: load from config # TODO: load from config
use_open_gl: bool = False, use_open_gl: bool = False,
static_yrange: Optional[tuple[float, float]] = None, static_yrange: tuple[float, float] | None = None,
parent=None, parent=None,
**kwargs, **kwargs,
@ -872,7 +871,7 @@ class ChartPlotWidget(pg.PlotWidget):
# NOTE: must be set bfore calling ``.mk_vb()`` # NOTE: must be set bfore calling ``.mk_vb()``
self.linked = linkedsplits self.linked = linkedsplits
self.sidepane: Optional[FieldsForm] = None self.sidepane: FieldsForm | None = None
# source of our custom interactions # source of our custom interactions
self.cv = self.mk_vb(name) self.cv = self.mk_vb(name)
@ -1035,7 +1034,7 @@ class ChartPlotWidget(pg.PlotWidget):
def increment_view( def increment_view(
self, self,
datums: int = 1, datums: int = 1,
vb: Optional[ChartView] = None, vb: ChartView | None = None,
) -> None: ) -> None:
''' '''
@ -1066,8 +1065,8 @@ class ChartPlotWidget(pg.PlotWidget):
def overlay_plotitem( def overlay_plotitem(
self, self,
name: str, name: str,
index: Optional[int] = None, index: int | None = None,
axis_title: Optional[str] = None, axis_title: str | None = None,
axis_side: str = 'right', axis_side: str = 'right',
axis_kwargs: dict = {}, axis_kwargs: dict = {},
@ -1140,11 +1139,11 @@ class ChartPlotWidget(pg.PlotWidget):
shm: ShmArray, shm: ShmArray,
flume: Flume, flume: Flume,
array_key: Optional[str] = None, array_key: str | None = None,
overlay: bool = False, overlay: bool = False,
color: Optional[str] = None, color: str | None = None,
add_label: bool = True, add_label: bool = True,
pi: Optional[pg.PlotItem] = None, pi: pg.PlotItem | None = None,
step_mode: bool = False, step_mode: bool = False,
is_ohlc: bool = False, is_ohlc: bool = False,
add_sticky: None | str = 'right', add_sticky: None | str = 'right',
@ -1277,7 +1276,7 @@ class ChartPlotWidget(pg.PlotWidget):
shm: ShmArray, shm: ShmArray,
flume: Flume, flume: Flume,
array_key: Optional[str] = None, array_key: str | None = None,
**draw_curve_kwargs, **draw_curve_kwargs,
) -> Viz: ) -> Viz:
@ -1308,10 +1307,10 @@ class ChartPlotWidget(pg.PlotWidget):
def maxmin( def maxmin(
self, self,
name: Optional[str] = None, name: str | None = None,
bars_range: Optional[tuple[ bars_range: tuple[
int, int, int, int, int, int int, int, int, int, int, int
]] = None, ] | None = None,
) -> tuple[float, float]: ) -> tuple[float, float]:
''' '''

10
piker/ui/_cursor.py
View File

@ -21,7 +21,6 @@ Mouse interaction graphics
from __future__ import annotations from __future__ import annotations
from functools import partial from functools import partial
from typing import ( from typing import (
Optional,
Callable, Callable,
TYPE_CHECKING, TYPE_CHECKING,
) )
@ -38,7 +37,10 @@ from ._style import (
_font_small, _font_small,
_font, _font,
) )
from ._axes import YAxisLabel, XAxisLabel from ._axes import (
YAxisLabel,
XAxisLabel,
)
from ..log import get_logger from ..log import get_logger
if TYPE_CHECKING: if TYPE_CHECKING:
@ -167,7 +169,7 @@ class ContentsLabel(pg.LabelItem):
anchor_at: str = ('top', 'right'), anchor_at: str = ('top', 'right'),
justify_text: str = 'left', justify_text: str = 'left',
font_size: Optional[int] = None, font_size: int | None = None,
) -> None: ) -> None:
@ -338,7 +340,7 @@ class Cursor(pg.GraphicsObject):
self.linked = linkedsplits self.linked = linkedsplits
self.graphics: dict[str, pg.GraphicsObject] = {} self.graphics: dict[str, pg.GraphicsObject] = {}
self.xaxis_label: Optional[XAxisLabel] = None self.xaxis_label: XAxisLabel | None = None
self.always_show_xlabel: bool = True self.always_show_xlabel: bool = True
self.plots: list['PlotChartWidget'] = [] # type: ignore # noqa self.plots: list['PlotChartWidget'] = [] # type: ignore # noqa
self.active_plot = None self.active_plot = None

8
piker/ui/_curve.py
View File

@ -19,7 +19,7 @@ Fast, smooth, sexy curves.
""" """
from contextlib import contextmanager as cm from contextlib import contextmanager as cm
from typing import Optional, Callable from typing import Callable
import numpy as np import numpy as np
import pyqtgraph as pg import pyqtgraph as pg
@ -86,7 +86,7 @@ class FlowGraphic(pg.GraphicsObject):
# line styling # line styling
color: str = 'bracket', color: str = 'bracket',
last_step_color: str | None = None, last_step_color: str | None = None,
fill_color: Optional[str] = None, fill_color: str | None = None,
style: str = 'solid', style: str = 'solid',
**kwargs **kwargs
@ -191,14 +191,14 @@ class Curve(FlowGraphic):
''' '''
# TODO: can we remove this? # TODO: can we remove this?
# sub_br: Optional[Callable] = None # sub_br: Callable | None = None
def __init__( def __init__(
self, self,
*args, *args,
# color: str = 'default_lightest', # color: str = 'default_lightest',
# fill_color: Optional[str] = None, # fill_color: str | None = None,
# style: str = 'solid', # style: str = 'solid',
**kwargs **kwargs

5
piker/ui/_dataviz.py
View File

@ -25,7 +25,6 @@ from math import (
floor, floor,
) )
from typing import ( from typing import (
Optional,
Literal, Literal,
TYPE_CHECKING, TYPE_CHECKING,
) )
@ -249,7 +248,7 @@ class Viz(msgspec.Struct): # , frozen=True):
# in some cases a viz may want to change its # in some cases a viz may want to change its
# graphical "type" or, "form" when downsampling, to # graphical "type" or, "form" when downsampling, to
# start this is only ever an interpolation line. # start this is only ever an interpolation line.
ds_graphics: Optional[Curve] = None ds_graphics: Curve | None = None
is_ohlc: bool = False is_ohlc: bool = False
render: bool = True # toggle for display loop render: bool = True # toggle for display loop
@ -576,7 +575,7 @@ class Viz(msgspec.Struct): # , frozen=True):
def read( def read(
self, self,
array_field: Optional[str] = None, array_field: str | None = None,
index_field: str | None = None, index_field: str | None = None,
profiler: None | Profiler = None, profiler: None | Profiler = None,

7
piker/ui/_display.py
View File

@ -26,7 +26,6 @@ import itertools
from math import floor from math import floor
import time import time
from typing import ( from typing import (
Optional,
Any, Any,
TYPE_CHECKING, TYPE_CHECKING,
) )
@ -205,8 +204,8 @@ class DisplayState(Struct):
globalz: None | dict[str, Any] = None globalz: None | dict[str, Any] = None
vlm_chart: Optional[ChartPlotWidget] = None vlm_chart: ChartPlotWidget | None = None
vlm_sticky: Optional[YAxisLabel] = None vlm_sticky: YAxisLabel | None = None
wap_in_history: bool = False wap_in_history: bool = False
@ -494,7 +493,7 @@ def graphics_update_cycle(
wap_in_history: bool = False, wap_in_history: bool = False,
trigger_all: bool = False, # flag used by prepend history updates trigger_all: bool = False, # flag used by prepend history updates
prepend_update_index: Optional[int] = None, prepend_update_index: int | None = None,
) -> None: ) -> None:

5
piker/ui/_editors.py
View File

@ -21,7 +21,6 @@ Higher level annotation editors.
from __future__ import annotations from __future__ import annotations
from collections import defaultdict from collections import defaultdict
from typing import ( from typing import (
Optional,
TYPE_CHECKING TYPE_CHECKING
) )
@ -67,7 +66,7 @@ class ArrowEditor(Struct):
x: float, x: float,
y: float, y: float,
color='default', color='default',
pointing: Optional[str] = None, pointing: str | None = None,
) -> pg.ArrowItem: ) -> pg.ArrowItem:
''' '''
@ -221,7 +220,7 @@ class LineEditor(Struct):
line: LevelLine = None, line: LevelLine = None,
uuid: str = None, uuid: str = None,
) -> Optional[LevelLine]: ) -> LevelLine | None:
'''Remove a line by refernce or uuid. '''Remove a line by refernce or uuid.
If no lines or ids are provided remove all lines under the If no lines or ids are provided remove all lines under the

14
piker/ui/_forms.py
View File

@ -23,7 +23,9 @@ from contextlib import asynccontextmanager
from functools import partial from functools import partial
from math import floor from math import floor
from typing import ( from typing import (
Optional, Any, Callable, Awaitable Any,
Callable,
Awaitable,
) )
import trio import trio
@ -263,7 +265,7 @@ class Selection(QComboBox):
def set_icon( def set_icon(
self, self,
key: str, key: str,
icon_name: Optional[str], icon_name: str | None,
) -> None: ) -> None:
self.setItemIcon( self.setItemIcon(
@ -344,7 +346,7 @@ class FieldsForm(QWidget):
name: str, name: str,
font_size: Optional[int] = None, font_size: int | None = None,
font_color: str = 'default_lightest', font_color: str = 'default_lightest',
) -> QtGui.QLabel: ) -> QtGui.QLabel:
@ -469,7 +471,7 @@ def mk_form(
parent: QWidget, parent: QWidget,
fields_schema: dict, fields_schema: dict,
font_size: Optional[int] = None, font_size: int | None = None,
) -> FieldsForm: ) -> FieldsForm:
@ -628,7 +630,7 @@ def mk_fill_status_bar(
parent_pane: QWidget, parent_pane: QWidget,
form: FieldsForm, form: FieldsForm,
pane_vbox: QVBoxLayout, pane_vbox: QVBoxLayout,
label_font_size: Optional[int] = None, label_font_size: int | None = None,
) -> ( ) -> (
# TODO: turn this into a composite? # TODO: turn this into a composite?
@ -738,7 +740,7 @@ def mk_fill_status_bar(
def mk_order_pane_layout( def mk_order_pane_layout(
parent: QWidget, parent: QWidget,
# accounts: dict[str, Optional[str]], # accounts: dict[str, str | None],
) -> FieldsForm: ) -> FieldsForm:

9
piker/ui/_fsp.py
View File

@ -24,7 +24,10 @@ from contextlib import asynccontextmanager as acm
from functools import partial from functools import partial
import inspect import inspect
from itertools import cycle from itertools import cycle
from typing import Optional, AsyncGenerator, Any from typing import (
AsyncGenerator,
Any,
)
import numpy as np import numpy as np
import msgspec import msgspec
@ -80,7 +83,7 @@ def has_vlm(ohlcv: ShmArray) -> bool:
def update_fsp_chart( def update_fsp_chart(
viz, viz,
graphics_name: str, graphics_name: str,
array_key: Optional[str], array_key: str | None,
**kwargs, **kwargs,
) -> None: ) -> None:
@ -476,7 +479,7 @@ class FspAdmin:
target: Fsp, target: Fsp,
conf: dict[str, dict[str, Any]], conf: dict[str, dict[str, Any]],
worker_name: Optional[str] = None, worker_name: str | None = None,
loglevel: str = 'info', loglevel: str = 'info',
) -> (Flume, trio.Event): ) -> (Flume, trio.Event):

15
piker/ui/_interaction.py
View File

@ -26,7 +26,6 @@ from math import (
import time import time
from typing import ( from typing import (
Any, Any,
Optional,
Callable, Callable,
TYPE_CHECKING, TYPE_CHECKING,
) )
@ -93,7 +92,7 @@ async def handle_viewmode_kb_inputs(
last = time.time() last = time.time()
action: str action: str
on_next_release: Optional[Callable] = None on_next_release: Callable | None = None
# for quick key sequence-combo pattern matching # for quick key sequence-combo pattern matching
# we have a min_tap period and these should not # we have a min_tap period and these should not
@ -379,7 +378,7 @@ class ChartView(ViewBox):
name: str, name: str,
parent: pg.PlotItem = None, parent: pg.PlotItem = None,
static_yrange: Optional[tuple[float, float]] = None, static_yrange: tuple[float, float] | None = None,
**kwargs, **kwargs,
): ):
@ -595,7 +594,7 @@ class ChartView(ViewBox):
def mouseDragEvent( def mouseDragEvent(
self, self,
ev, ev,
axis: Optional[int] = None, axis: int | None = None,
) -> None: ) -> None:
pos = ev.pos() pos = ev.pos()
@ -753,19 +752,19 @@ class ChartView(ViewBox):
self, self,
*, *,
yrange: Optional[tuple[float, float]] = None, yrange: tuple[float, float] | None = None,
viz: Viz | None = None, viz: Viz | None = None,
# NOTE: this value pairs (more or less) with L1 label text # NOTE: this value pairs (more or less) with L1 label text
# height offset from from the bid/ask lines. # height offset from from the bid/ask lines.
range_margin: float | None = 0.09, range_margin: float | None = 0.09,
bars_range: Optional[tuple[int, int, int, int]] = None, bars_range: tuple[int, int, int, int] | None = None,
# flag to prevent triggering sibling charts from the same linked # flag to prevent triggering sibling charts from the same linked
# set from recursion errors. # set from recursion errors.
autoscale_linked_plots: bool = False, autoscale_linked_plots: bool = False,
name: Optional[str] = None, name: str | None = None,
) -> None: ) -> None:
''' '''
@ -871,7 +870,7 @@ class ChartView(ViewBox):
def enable_auto_yrange( def enable_auto_yrange(
self, self,
viz: Viz, viz: Viz,
src_vb: Optional[ChartView] = None, src_vb: ChartView | None = None,
) -> None: ) -> None:
''' '''

11
piker/ui/_label.py
View File

@ -19,7 +19,10 @@ Non-shitty labels that don't re-invent the wheel.
""" """
from inspect import isfunction from inspect import isfunction
from typing import Callable, Optional, Any from typing import (
Callable,
Any,
)
import pyqtgraph as pg import pyqtgraph as pg
from PyQt5 import QtGui, QtWidgets from PyQt5 import QtGui, QtWidgets
@ -70,9 +73,7 @@ class Label:
self._fmt_str = fmt_str self._fmt_str = fmt_str
self._view_xy = QPointF(0, 0) self._view_xy = QPointF(0, 0)
self.scene_anchor: Optional[ self.scene_anchor: Callable[..., QPointF] | None = None
Callable[..., QPointF]
] = None
self._x_offset = x_offset self._x_offset = x_offset
@ -164,7 +165,7 @@ class Label:
self, self,
y: float, y: float,
x: Optional[float] = None, x: float | None = None,
) -> None: ) -> None:

13
piker/ui/_lines.py
View File

@ -22,7 +22,6 @@ from __future__ import annotations
from functools import partial from functools import partial
from math import floor from math import floor
from typing import ( from typing import (
Optional,
Callable, Callable,
TYPE_CHECKING, TYPE_CHECKING,
) )
@ -32,7 +31,7 @@ from pyqtgraph import Point, functions as fn
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from PyQt5.QtCore import QPointF from PyQt5.QtCore import QPointF
from ._annotate import qgo_draw_markers, LevelMarker from ._annotate import LevelMarker
from ._anchors import ( from ._anchors import (
vbr_left, vbr_left,
right_axis, right_axis,
@ -295,7 +294,7 @@ class LevelLine(pg.InfiniteLine):
# show y-crosshair again # show y-crosshair again
cursor.show_xhair() cursor.show_xhair()
def get_cursor(self) -> Optional[Cursor]: def get_cursor(self) -> Cursor | None:
chart = self._chart chart = self._chart
cur = chart.linked.cursor cur = chart.linked.cursor
@ -610,11 +609,11 @@ def order_line(
chart, chart,
level: float, level: float,
action: Optional[str] = 'buy', # buy or sell action: str | None = 'buy', # buy or sell
marker_style: Optional[str] = None, marker_style: str | None = None,
level_digits: Optional[float] = 3, level_digits: float | None = 3,
size: Optional[int] = 1, size: int | None = 1,
size_digits: int = 1, size_digits: int = 1,
show_markers: bool = False, show_markers: bool = False,
submit_price: float = None, submit_price: float = None,

3
piker/ui/_notify.py
View File

@ -21,7 +21,6 @@ Notifications utils.
import os import os
import platform import platform
import subprocess import subprocess
from typing import Optional
import trio import trio
@ -33,7 +32,7 @@ from ..clearing._messages import (
log = get_logger(__name__) log = get_logger(__name__)
_dbus_uid: Optional[str] = '' _dbus_uid: str | None = ''
async def notify_from_ems_status_msg( async def notify_from_ems_status_msg(

13
piker/ui/_orm.py
View File

@ -20,8 +20,9 @@ micro-ORM for coupling ``pydantic`` models with Qt input/output widgets.
""" """
from __future__ import annotations from __future__ import annotations
from typing import ( from typing import (
Optional, Generic, Generic,
TypeVar, Callable, TypeVar,
Callable,
) )
# from pydantic import BaseModel, validator # from pydantic import BaseModel, validator
@ -42,13 +43,11 @@ DataType = TypeVar('DataType')
class Field(GenericModel, Generic[DataType]): class Field(GenericModel, Generic[DataType]):
widget_factory: Optional[ widget_factory: Callable[
Callable[
[QWidget, 'Field'], [QWidget, 'Field'],
QWidget QWidget
] ] | None = None
] value: DataType | None = None
value: Optional[DataType] = None
class Selection(Field[DataType], Generic[DataType]): class Selection(Field[DataType], Generic[DataType]):

17
piker/ui/_pg_overrides.py
View File

@ -22,8 +22,6 @@ Generally, our does not require "scentific precision" for pixel perfect
view transforms. view transforms.
""" """
from typing import Optional
import pyqtgraph as pg import pyqtgraph as pg
from ._axes import Axis from ._axes import Axis
@ -47,9 +45,10 @@ def invertQTransform(tr):
def _do_overrides() -> None: def _do_overrides() -> None:
"""Dooo eeet. '''
Dooo eeet.
""" '''
# we don't care about potential fp issues inside Qt # we don't care about potential fp issues inside Qt
pg.functions.invertQTransform = invertQTransform pg.functions.invertQTransform = invertQTransform
pg.PlotItem = PlotItem pg.PlotItem = PlotItem
@ -119,7 +118,7 @@ class PlotItem(pg.PlotItem):
name: str, name: str,
unlink: bool = True, unlink: bool = True,
) -> Optional[pg.AxisItem]: ) -> pg.AxisItem | None:
""" """
Remove an axis from the contained axis items Remove an axis from the contained axis items
by ```name: str```. by ```name: str```.
@ -169,14 +168,14 @@ class PlotItem(pg.PlotItem):
def setAxisItems( def setAxisItems(
self, self,
# XXX: yeah yeah, i know we can't use type annots like this yet. # XXX: yeah yeah, i know we can't use type annots like this yet.
axisItems: Optional[dict[str, pg.AxisItem]] = None, axisItems: dict[str, pg.AxisItem] | None = None,
add_to_layout: bool = True, add_to_layout: bool = True,
default_axes: list[str] = ['left', 'bottom'], default_axes: list[str] = ['left', 'bottom'],
): ):
""" '''
Override axis item setting to only Override axis item setting to only what is passed in.
""" '''
axisItems = axisItems or {} axisItems = axisItems or {}
# XXX: wth is is this even saying?!? # XXX: wth is is this even saying?!?

13
piker/ui/_position.py
View File

@ -25,7 +25,6 @@ from functools import partial
from math import floor, copysign from math import floor, copysign
from typing import ( from typing import (
Callable, Callable,
Optional,
TYPE_CHECKING, TYPE_CHECKING,
) )
@ -170,12 +169,12 @@ class SettingsPane:
limit_label: QLabel limit_label: QLabel
# encompasing high level namespace # encompasing high level namespace
order_mode: Optional['OrderMode'] = None # typing: ignore # noqa order_mode: OrderMode | None = None # typing: ignore # noqa
def set_accounts( def set_accounts(
self, self,
names: list[str], names: list[str],
sizes: Optional[list[float]] = None, sizes: list[float] | None = None,
) -> None: ) -> None:
combo = self.form.fields['account'] combo = self.form.fields['account']
@ -540,8 +539,8 @@ class Nav(Struct):
charts: dict[int, ChartPlotWidget] charts: dict[int, ChartPlotWidget]
pp_labels: dict[str, Label] = {} pp_labels: dict[str, Label] = {}
size_labels: dict[str, Label] = {} size_labels: dict[str, Label] = {}
lines: dict[str, Optional[LevelLine]] = {} lines: dict[str, LevelLine | None] = {}
level_markers: dict[str, Optional[LevelMarker]] = {} level_markers: dict[str, LevelMarker | None] = {}
color: str = 'default_lightest' color: str = 'default_lightest'
def update_ui( def update_ui(
@ -550,7 +549,7 @@ class Nav(Struct):
price: float, price: float,
size: float, size: float,
slots_used: float, slots_used: float,
size_digits: Optional[int] = None, size_digits: int | None = None,
) -> None: ) -> None:
''' '''
@ -847,7 +846,7 @@ class PositionTracker:
def update_from_pp( def update_from_pp(
self, self,
position: Optional[Position] = None, position: Position | None = None,
set_as_startup: bool = False, set_as_startup: bool = False,
) -> None: ) -> None:

15
piker/ui/_search.py
View File

@ -35,7 +35,6 @@ from collections import defaultdict
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
from functools import partial from functools import partial
from typing import ( from typing import (
Optional,
Callable, Callable,
Awaitable, Awaitable,
Sequence, Sequence,
@ -178,8 +177,8 @@ class CompleterView(QTreeView):
def resize_to_results( def resize_to_results(
self, self,
w: Optional[float] = 0, w: float | None = 0,
h: Optional[float] = None, h: float | None = None,
) -> None: ) -> None:
model = self.model() model = self.model()
@ -380,7 +379,7 @@ class CompleterView(QTreeView):
self, self,
section: str, section: str,
) -> Optional[QModelIndex]: ) -> QModelIndex | None:
''' '''
Find the *first* depth = 1 section matching ``section`` in Find the *first* depth = 1 section matching ``section`` in
the tree and return its index. the tree and return its index.
@ -504,7 +503,7 @@ class CompleterView(QTreeView):
def show_matches( def show_matches(
self, self,
wh: Optional[tuple[float, float]] = None, wh: tuple[float, float] | None = None,
) -> None: ) -> None:
@ -529,7 +528,7 @@ class SearchBar(Edit):
self, self,
parent: QWidget, parent: QWidget,
godwidget: QWidget, godwidget: QWidget,
view: Optional[CompleterView] = None, view: CompleterView | None = None,
**kwargs, **kwargs,
) -> None: ) -> None:
@ -708,7 +707,7 @@ class SearchWidget(QtWidgets.QWidget):
self, self,
clear_to_cache: bool = True, clear_to_cache: bool = True,
) -> Optional[str]: ) -> str | None:
''' '''
Attempt to load and switch the current selected Attempt to load and switch the current selected
completion result to the affiliated chart app. completion result to the affiliated chart app.
@ -1167,7 +1166,7 @@ async def register_symbol_search(
provider_name: str, provider_name: str,
search_routine: Callable, search_routine: Callable,
pause_period: Optional[float] = None, pause_period: float | None = None,
) -> AsyncIterator[dict]: ) -> AsyncIterator[dict]:

11
piker/ui/_style.py
View File

@ -18,7 +18,7 @@
Qt UI styling. Qt UI styling.
''' '''
from typing import Optional, Dict from typing import Dict
import math import math
import pyqtgraph as pg import pyqtgraph as pg
@ -52,7 +52,7 @@ class DpiAwareFont:
# TODO: move to config # TODO: move to config
name: str = 'Hack', name: str = 'Hack',
font_size: str = 'default', font_size: str = 'default',
# size_in_inches: Optional[float] = None,
) -> None: ) -> None:
self.name = name self.name = name
self._qfont = QtGui.QFont(name) self._qfont = QtGui.QFont(name)
@ -91,13 +91,14 @@ class DpiAwareFont:
def px_size(self) -> int: def px_size(self) -> int:
return self._qfont.pixelSize() return self._qfont.pixelSize()
def configure_to_dpi(self, screen: Optional[QtGui.QScreen] = None): def configure_to_dpi(self, screen: QtGui.QScreen | None = None):
"""Set an appropriately sized font size depending on the screen DPI. '''
Set an appropriately sized font size depending on the screen DPI.
If we end up needing to generalize this more here there are resources If we end up needing to generalize this more here there are resources
listed in the script in ``snippets/qt_screen_info.py``. listed in the script in ``snippets/qt_screen_info.py``.
""" '''
if screen is None: if screen is None:
screen = self.screen screen = self.screen

11
piker/ui/_window.py
View File

@ -23,7 +23,6 @@ import signal
import time import time
from typing import ( from typing import (
Callable, Callable,
Optional,
Union, Union,
) )
import uuid import uuid
@ -64,9 +63,9 @@ class MultiStatus:
self, self,
msg: str, msg: str,
final_msg: Optional[str] = None, final_msg: str | None = None,
clear_on_next: bool = False, clear_on_next: bool = False,
group_key: Optional[Union[bool, str]] = False, group_key: Union[bool, str] | None = False,
) -> Union[Callable[..., None], str]: ) -> Union[Callable[..., None], str]:
''' '''
@ -178,11 +177,11 @@ class MainWindow(QMainWindow):
self.setWindowTitle(self.title) self.setWindowTitle(self.title)
# set by runtime after `trio` is engaged. # set by runtime after `trio` is engaged.
self.godwidget: Optional[GodWidget] = None self.godwidget: GodWidget | None = None
self._status_bar: QStatusBar = None self._status_bar: QStatusBar = None
self._status_label: QLabel = None self._status_label: QLabel = None
self._size: Optional[tuple[int, int]] = None self._size: tuple[int, int] | None = None
@property @property
def mode_label(self) -> QLabel: def mode_label(self) -> QLabel:
@ -289,7 +288,7 @@ class MainWindow(QMainWindow):
def configure_to_desktop( def configure_to_desktop(
self, self,
size: Optional[tuple[int, int]] = None, size: tuple[int, int] | None = None,
) -> None: ) -> None:
''' '''

13
piker/ui/order_mode.py
View File

@ -25,7 +25,6 @@ from functools import partial
from pprint import pformat from pprint import pformat
import time import time
from typing import ( from typing import (
Optional,
Callable, Callable,
Any, Any,
TYPE_CHECKING, TYPE_CHECKING,
@ -129,7 +128,7 @@ class OrderMode:
trackers: dict[str, PositionTracker] trackers: dict[str, PositionTracker]
# switched state, the current position # switched state, the current position
current_pp: Optional[PositionTracker] = None current_pp: PositionTracker | None = None
active: bool = False active: bool = False
name: str = 'order' name: str = 'order'
dialogs: dict[str, Dialog] = field(default_factory=dict) dialogs: dict[str, Dialog] = field(default_factory=dict)
@ -139,7 +138,7 @@ class OrderMode:
'buy': 'buy_green', 'buy': 'buy_green',
'sell': 'sell_red', 'sell': 'sell_red',
} }
_staged_order: Optional[Order] = None _staged_order: Order | None = None
def on_level_change_update_next_order_info( def on_level_change_update_next_order_info(
self, self,
@ -180,7 +179,7 @@ class OrderMode:
def new_line_from_order( def new_line_from_order(
self, self,
order: Order, order: Order,
chart: Optional[ChartPlotWidget] = None, chart: ChartPlotWidget | None = None,
**line_kwargs, **line_kwargs,
) -> LevelLine: ) -> LevelLine:
@ -340,7 +339,7 @@ class OrderMode:
def submit_order( def submit_order(
self, self,
send_msg: bool = True, send_msg: bool = True,
order: Optional[Order] = None, order: Order | None = None,
) -> Dialog: ) -> Dialog:
''' '''
@ -452,7 +451,7 @@ class OrderMode:
def on_submit( def on_submit(
self, self,
uuid: str, uuid: str,
order: Optional[Order] = None, order: Order | None = None,
) -> Dialog: ) -> Dialog:
''' '''
@ -496,7 +495,7 @@ class OrderMode:
price: float, price: float,
time_s: float, time_s: float,
pointing: Optional[str] = None, pointing: str | None = None,
) -> None: ) -> None:
''' '''