diff --git a/v2realbot/ENTRY_backtest_strategyVykladaci.py b/v2realbot/ENTRY_backtest_strategyVykladaci.py index 151b356..9e031af 100644 --- a/v2realbot/ENTRY_backtest_strategyVykladaci.py +++ b/v2realbot/ENTRY_backtest_strategyVykladaci.py @@ -263,7 +263,10 @@ def next(data, state: StrategyState): state.vars.limitka = asyncio.run(state.interface.repl(price=state.vars.limitka_price, orderid=state.vars.limitka, size=int(state.positions))) limitka_qty = int(state.positions) state.ilog(e="Změněna limitka", limitka=str(state.vars.limitka), limitka_price=state.vars.limitka_price, limitka_qty=limitka_qty) - + + #dodelat limitka existuje, ale spatne + + if pendingbuys_new != state.vars.pendingbuys: state.ilog(e="Rozdilna PB prepsana", pb_new=pendingbuys_new, pb_old = state.vars.pendingbuys) print("ROZDILNA PENDINGBUYS přepsána") diff --git a/v2realbot/strategy/StrategyOrderLimitVykladaci.py b/v2realbot/strategy/StrategyOrderLimitVykladaci.py index ca2eb58..c490bdb 100644 --- a/v2realbot/strategy/StrategyOrderLimitVykladaci.py +++ b/v2realbot/strategy/StrategyOrderLimitVykladaci.py @@ -38,9 +38,11 @@ class StrategyOrderLimitVykladaci(Strategy): self.state.vars.limitka = await self.interface.sell_l(price=price, size=o.filled_qty) #obcas live vrati "held for orders", odchytime chybu a limitku nevytvarime - spravi to dalsi notifikace nebo konzolidace if self.state.vars.limitka == -1: + self.state.ilog(e="Vytvoreni limitky neprobehlo, vracime None", msg=str(self.state.vars.limitka)) self.state.vars.limitka = None - self.state.vars.limitka_price = price - self.state.ilog(e="Příchozí BUY notif - vytvarime limitku", msg="order status:"+o.status, orderid=str(o.id), limitka=str(self.state.vars.limitka), limtka_price=self.state.vars.limitka_price) + else: + self.state.vars.limitka_price = price + self.state.ilog(e="Příchozí BUY notif - vytvarime limitku", msg="order status:"+o.status, orderid=str(o.id), limitka=str(self.state.vars.limitka), limtka_price=self.state.vars.limitka_price) else: #avgp, pos self.state.avgp, self.state.positions = self.state.interface.pos() @@ -50,9 +52,11 @@ class StrategyOrderLimitVykladaci(Strategy): self.state.vars.limitka = await self.interface.repl(price=cena,orderid=self.state.vars.limitka,size=int(self.state.positions)) #odchyceni pripadne chyby na live if self.state.vars.limitka == -1: + self.state.ilog(e="Zmena limitky neprobehla, vracime puvodni", msg=str(self.state.vars.limitka)) self.state.vars.limitka = puvodni - self.state.vars.limitka_price = cena - self.state.ilog(e="Příchozí BUY notif - menime limitku", msg="order status:"+o.status, orderid=str(o.id), limitka=str(self.state.vars.limitka), limtka_price=self.state.vars.limitka_price, puvodni_limitka=str(puvodni)) + else: + self.state.vars.limitka_price = cena + self.state.ilog(e="Příchozí BUY notif - menime limitku", msg="order status:"+o.status, orderid=str(o.id), limitka=str(self.state.vars.limitka), limtka_price=self.state.vars.limitka_price, puvodni_limitka=str(puvodni)) except APIError as e: self.state.ilog(e="API ERROR pri zmene limitky", msg=str(e), orderid=str(o.id), limitka=str(self.state.vars.limitka), limitka_price=self.state.vars.limitka_price, puvodni_limitka=str(puvodni)) @@ -73,11 +77,9 @@ class StrategyOrderLimitVykladaci(Strategy): #muzeme znovu nakupovat, mazeme limitku, blockbuy a pendingbuys #self.state.blockbuy = 0 - #ADDPROFIT - datd o funkce - prodej = data.order.filled_qty * data.order.filled_avg_price - nakup = self.state.positions - - + #ADDPROFIT - datd o funkce, zatim vraci chybu + #prodej = data.order.filled_qty * data.order.filled_avg_price + #nakup = self.state.positions ic("notifikace sell mazeme limitku a update pozic") #updatujeme pozice