From e1f58ad7c4282ab606be240de26d59b48524be68 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Thu, 12 Jan 2023 16:30:56 -0500 Subject: [PATCH] Provide `datetime`-sorted clears table iteration Likely pertains to helping with stuff in issues #345 and #373 and just generally is handy to have when processing ledgers / clearing event tables. Adds the following helper methods: - `iter_by_dt()` to iter-sort an arbitrary `Transaction`-like table of clear entries. - `Position.iter_clears()` as a convenience wrapper for the above. --- piker/pp.py | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/piker/pp.py b/piker/pp.py index 8fdaaa4d0..48cf0daa1 100644 --- a/piker/pp.py +++ b/piker/pp.py @@ -29,6 +29,7 @@ import time from typing import ( Any, + Iterator, Optional, Union, ) @@ -116,6 +117,21 @@ class Transaction(Struct, frozen=True): # from: Optional[str] = None +def iter_by_dt( + clears: dict[str, Any], +) -> Iterator[tuple[str, dict]]: + ''' + Iterate entries of a ``clears: dict`` table sorted by entry recorded + datetime presumably set at the ``'dt'`` field in each entry. + + ''' + for tid, data in sorted( + list(clears.items()), + key=lambda item: item[1]['dt'], + ): + yield tid, data + + class Position(Struct): ''' Basic pp (personal/piker position) model with attached clearing @@ -183,12 +199,7 @@ def to_pretoml(self) -> tuple[str, dict]: toml_clears_list = [] # reverse sort so latest clears are at top of section? - for tid, data in sorted( - list(clears.items()), - - # sort by datetime - key=lambda item: item[1]['dt'], - ): + for tid, data in iter_by_dt(clears): inline_table = toml.TomlDecoder().get_empty_inline_table() # serialize datetime to parsable `str` @@ -301,6 +312,14 @@ def dsize(self) -> float: # def lifo_price() -> float: # ... + def iter_clears(self) -> Iterator[tuple[str, dict]]: + ''' + Iterate the internally managed ``.clears: dict`` table in + datetime-stamped order. + + ''' + return iter_by_dt(self.clears) + def calc_ppu( self, # include transaction cost in breakeven price @@ -331,10 +350,9 @@ def calc_ppu( asize_h: list[float] = [] # historical accumulative size ppu_h: list[float] = [] # historical price-per-unit - clears = list(self.clears.items()) - - for i, (tid, entry) in enumerate(clears): - + tid: str + entry: dict[str, Any] + for (tid, entry) in self.iter_clears(): clear_size = entry['size'] clear_price = entry['price'] @@ -344,6 +362,11 @@ def calc_ppu( sign_change: bool = False + if accum_size == 0: + ppu_h.append(0) + asize_h.append(0) + continue + if accum_size == 0: ppu_h.append(0) asize_h.append(0)