diff --git a/v2realbot/static/js/mytables.js b/v2realbot/static/js/mytables.js
index 0f4818b..e594718 100644
--- a/v2realbot/static/js/mytables.js
+++ b/v2realbot/static/js/mytables.js
@@ -1,6 +1,35 @@
API_KEY = localStorage.getItem("api-key")
+//KEY shortcuts
+Mousetrap.bind('e', function() {
+ $( "#button_edit" ).trigger( "click" );
+});
+Mousetrap.bind('a', function() {
+ $( "#button_add" ).trigger( "click" );
+});
+Mousetrap.bind('d', function() {
+ $( "#button_dup" ).trigger( "click" );
+});
+Mousetrap.bind('c', function() {
+ $( "#button_copy" ).trigger( "click" );
+});
+Mousetrap.bind('r', function() {
+ $( "#button_run" ).trigger( "click" );
+});
+Mousetrap.bind('p', function() {
+ $( "#button_pause" ).trigger( "click" );
+});
+Mousetrap.bind('s', function() {
+ $( "#button_stop" ).trigger( "click" );
+});
+Mousetrap.bind('j', function() {
+ $( "#button_add_json" ).trigger( "click" );
+});
+Mousetrap.bind('x', function() {
+ $( "#button_delete" ).trigger( "click" );
+});
+
//on button
function store_api_key(event) {
key = document.getElementById("api-key").value;
diff --git a/v2realbot/static/js/mywebsocket.js b/v2realbot/static/js/mywebsocket.js
index 555f349..3759572 100644
--- a/v2realbot/static/js/mywebsocket.js
+++ b/v2realbot/static/js/mywebsocket.js
@@ -62,7 +62,7 @@ function connect(event) {
var lines = document.getElementById('lines')
var line = document.createElement('div')
line.classList.add("line")
- const newLine = document.createTextNode("-----------------NEXT ITER------------------")
+ const newLine = document.createTextNode("---------------")
line.appendChild(newLine)
lines.appendChild(line)
@@ -84,8 +84,7 @@ function connect(event) {
logcnt++;
row = '
'+logLine.time + " " + logLine.event + ' - '+ logLine.message+'
'
str_row = JSON.stringify(logLine.details, null, 2)
-
- row_detail = '
'
+ row_detail = '
'
var lines = document.getElementById('lines')
var line = document.createElement('div')
diff --git a/v2realbot/strategy/StrategyOrderLimitVykladaci.py b/v2realbot/strategy/StrategyOrderLimitVykladaci.py
index 4d0d3aa..ccb8571 100644
--- a/v2realbot/strategy/StrategyOrderLimitVykladaci.py
+++ b/v2realbot/strategy/StrategyOrderLimitVykladaci.py
@@ -1,10 +1,11 @@
from v2realbot.strategy.base import Strategy
-from v2realbot.utils.utils import parse_alpaca_timestamp, ltp, AttributeDict,trunc,price2dec, zoneNY, print
+from v2realbot.utils.utils import parse_alpaca_timestamp, ltp, AttributeDict,trunc,price2dec, zoneNY, print, json_serial
from v2realbot.utils.tlog import tlog, tlog_exception
from v2realbot.enums.enums import Mode, Order, Account
from alpaca.trading.models import TradeUpdate
from alpaca.trading.enums import TradeEvent, OrderStatus
from v2realbot.indicators.indicators import ema
+import json
#from rich import print
from random import randrange
from alpaca.common.exceptions import APIError
@@ -12,13 +13,15 @@ import copy
from threading import Event
+
class StrategyOrderLimitVykladaci(Strategy):
def __init__(self, name: str, symbol: str, next: callable, init: callable, account: Account, mode: Mode = Mode.PAPER, stratvars: AttributeDict = None, open_rush: int = 30, close_rush: int = 30, pe: Event = None, se: Event = None) -> None:
super().__init__(name, symbol, next, init, account, mode, stratvars, open_rush, close_rush, pe, se)
async def orderUpdateBuy(self, data: TradeUpdate):
o: Order = data.order
- self.state.ilog(e="Příchozí BUY notifikace", msg="order status:"+o.status, status=o.status, orderid=str(o.id))
+ ##nejak to vymyslet, aby se dal poslat cely Trade a serializoval se
+ self.state.ilog(e="Příchozí BUY notifikace", msg="order status:"+o.status, trade=json.loads(json.dumps(data, default=json_serial)))
if o.status == OrderStatus.FILLED or o.status == OrderStatus.CANCELED:
#pokud existuje objednavka v pendingbuys - vyhodime ji
@@ -68,6 +71,7 @@ class StrategyOrderLimitVykladaci(Strategy):
async def orderUpdateSell(self, data: TradeUpdate):
+ self.state.ilog(e="Příchozí SELL notifikace", msg="order status:"+data.order.status, trade=json.loads(json.dumps(data, default=json_serial)))
#PROFIT
#profit pocitame z TradeUpdate.price a TradeUpdate.qty - aktualne provedene mnozstvi a cena
#naklady vypocteme z prumerne ceny, kterou mame v pozicich
@@ -117,19 +121,19 @@ class StrategyOrderLimitVykladaci(Strategy):
def buy(self, size = None, repeat: bool = False):
print("overriden method to size&check maximum ")
if int(self.state.positions) >= self.state.vars.maxpozic:
- self.state.ilog(e="buy Maxim mnozstvi naplneno", curr_positions=self.state.positions)
+ self.state.ilog(e="buy Maxim mnozstvi naplneno", positions=self.state.positions)
print("max mnostvi naplneno")
return 0
if size is None:
sizer = self.state.vars.chunk
else:
sizer = size
+
self.state.blockbuy = 1
self.state.vars.lastbuyindex = self.state.bars['index'][-1]
- ic(self.state.blockbuy)
- ic(self.state.vars.lastbuyindex)
+ self.state.ilog(e="send MARKET buy to if", msg="S:"+str(size), ltp=self.state.interface.get_last_price(self.state.symbol))
return self.state.interface.buy(size=sizer)
-
+
def buy_l(self, price: float = None, size = None, repeat: bool = False):
print("entering overriden BUY")
if int(self.state.positions) >= self.state.vars.maxpozic:
@@ -139,7 +143,7 @@ class StrategyOrderLimitVykladaci(Strategy):
if price is None: price=price2dec((self.state.interface.get_last_price(self.symbol)))
ic(price)
print("odesilame LIMIT s cenou/qty", price, size)
- self.state.ilog(e="send buy to if", msg="S:"+str(size)+" P:"+str(price), price=price, size=size)
+ self.state.ilog(e="send LIMIT buy to if", msg="S:"+str(size)+" P:"+str(price), price=price, size=size)
order = self.state.interface.buy_l(price=price, size=size)
print("ukladame pendingbuys")
self.state.vars.pendingbuys[str(order)]=price
diff --git a/v2realbot/strategy/__pycache__/StrategyOrderLimitVykladaci.cpython-310.pyc b/v2realbot/strategy/__pycache__/StrategyOrderLimitVykladaci.cpython-310.pyc
index 778a6e7..02f26d6 100644
Binary files a/v2realbot/strategy/__pycache__/StrategyOrderLimitVykladaci.cpython-310.pyc and b/v2realbot/strategy/__pycache__/StrategyOrderLimitVykladaci.cpython-310.pyc differ
diff --git a/v2realbot/strategy/__pycache__/base.cpython-310.pyc b/v2realbot/strategy/__pycache__/base.cpython-310.pyc
index f23230f..cb2b7c8 100644
Binary files a/v2realbot/strategy/__pycache__/base.cpython-310.pyc and b/v2realbot/strategy/__pycache__/base.cpython-310.pyc differ
diff --git a/v2realbot/strategy/base.py b/v2realbot/strategy/base.py
index 534e8ae..8c7c2bc 100644
--- a/v2realbot/strategy/base.py
+++ b/v2realbot/strategy/base.py
@@ -17,6 +17,8 @@ from v2realbot.interfaces.backtest_interface import BacktestInterface
from v2realbot.interfaces.live_interface import LiveInterface
from alpaca.trading.enums import OrderSide
from v2realbot.backtesting.backtester import Backtester
+from alpaca.trading.models import TradeUpdate
+from alpaca.trading.enums import TradeEvent, OrderStatus
from threading import Event, current_thread
import json
@@ -48,6 +50,7 @@ class Strategy:
self.account = account
self.key = get_key(mode=self.mode, account=self.account)
self.rtqueue = None
+ self.tradeList = []
#TODO predelat na dynamické queues
@@ -308,7 +311,7 @@ class Strategy:
#for order updates from LIVE or BACKTEST
#updates are sent only for SYMBOL of strategy
- async def order_updates(self, data):
+ async def order_updates(self, data: TradeUpdate):
if self.mode == Mode.LIVE or self.mode == Mode.PAPER:
now = datetime.now().timestamp()
else:
@@ -316,10 +319,16 @@ class Strategy:
print("NOTIFICATION ARRIVED AT:", now)
+ #pokud jde o FILL zapisujeme do self.trades a notifikujeme
+ if data.event == TradeEvent.FILL:
+ self.tradeList.append(data)
+
##TradeUpdate objekt better?
order: Order = data.order
- if order.side == OrderSide.BUY: await self.orderUpdateBuy(data)
- if order.side == OrderSide.SELL: await self.orderUpdateSell(data)
+ if order.side == OrderSide.BUY:
+ await self.orderUpdateBuy(data)
+ if order.side == OrderSide.SELL:
+ await self.orderUpdateSell(data)
async def orderUpdateBuy(self, data):
print(data)
diff --git a/v2realbot/utils/__pycache__/utils.cpython-310.pyc b/v2realbot/utils/__pycache__/utils.cpython-310.pyc
index 8781759..b066da0 100644
Binary files a/v2realbot/utils/__pycache__/utils.cpython-310.pyc and b/v2realbot/utils/__pycache__/utils.cpython-310.pyc differ
diff --git a/v2realbot/utils/utils.py b/v2realbot/utils/utils.py
index bae320d..718163c 100644
--- a/v2realbot/utils/utils.py
+++ b/v2realbot/utils/utils.py
@@ -16,6 +16,24 @@ import tomli
from v2realbot.config import DATA_DIR, QUIET_MODE
import requests
from uuid import UUID
+from enum import Enum
+#from v2realbot.enums.enums import Order
+from v2realbot.common.model import Order, TradeUpdate
+
+def safe_get(collection, key, default=None):
+ """Get values from a collection without raising errors"""
+
+ try:
+ return collection.get(key, default)
+ except TypeError:
+ pass
+
+ try:
+ return collection[key]
+ except (IndexError, TypeError):
+ pass
+
+ return default
def send_to_telegram(message):
apiToken = '5836666362:AAGPuzwp03tczMQTwTBiHW6VsZZ-1RCMAEE'
@@ -38,6 +56,12 @@ def json_serial(obj):
return obj.timestamp()
if isinstance(obj, UUID):
return str(obj)
+ if isinstance(obj, Enum):
+ return str(obj)
+ if type(obj) is Order:
+ return obj.__dict__
+ if type(obj) is TradeUpdate:
+ return obj.__dict__
raise TypeError (str(obj)+"Type %s not serializable" % type(obj))
def parse_toml_string(tomlst: str):