From 8f7ca4a8b2fdefecc830eb41edcd91784aeeebd5 Mon Sep 17 00:00:00 2001
From: David Brazda <davidbrazda61@gmail.com>
Date: Fri, 14 Apr 2023 12:06:37 +0200
Subject: [PATCH] inject stratvars

---
 testy/changeDict.py                           |  50 ++++++++++
 testy/gethistorytrades.py                     |  24 +++--
 v2realbot/ENTRY_backtest_strategyVykladaci.py |   8 +-
 v2realbot/__pycache__/config.cpython-310.pyc  | Bin 2465 -> 2546 bytes
 .../__pycache__/backtester.cpython-310.pyc    | Bin 17942 -> 18056 bytes
 v2realbot/backtesting/backtester.py           |  19 +++-
 v2realbot/config.py                           |   1 +
 v2realbot/controller/services.py              |  88 ++++++++++++------
 .../__pycache__/aggregator.cpython-310.pyc    | Bin 6490 -> 6493 bytes
 v2realbot/loader/aggregator.py                |   3 +-
 v2realbot/static/index.html                   |   2 +-
 v2realbot/static/js/mywebsocket.js            |   2 +-
 .../dash_save_html.cpython-310.pyc            | Bin 3618 -> 3628 bytes
 .../utils/__pycache__/utils.cpython-310.pyc   | Bin 6923 -> 6933 bytes
 v2realbot/utils/dash_save_html.py             |   2 +-
 v2realbot/utils/utils.py                      |   2 +-
 16 files changed, 144 insertions(+), 57 deletions(-)
 create mode 100644 testy/changeDict.py

diff --git a/testy/changeDict.py b/testy/changeDict.py
new file mode 100644
index 0000000..0b3db48
--- /dev/null
+++ b/testy/changeDict.py
@@ -0,0 +1,50 @@
+from v2realbot.utils.utils import AttributeDict
+
+stratvars_parsed_old = AttributeDict(maxpozic = 250,
+                          chunk = 10,
+                          MA = 3,
+                          Trend = 3,
+                          profit = 0.02,
+                          lastbuyindex=-6,
+                          pendingbuys={},
+                          limitka = None,
+                          jevylozeno=0,
+                          vykladka=5,
+                          curve = [0.01, 0.01, 0.01, 0, 0.02, 0.02, 0.01,0.01, 0.01,0.03, 0.01, 0.01, 0.01,0.04, 0.01,0.01, 0.01,0.05, 0.01,0.01, 0.01,0.01, 0.06,0.01, 0.01,0.01, 0.01],
+                          blockbuy = 0,
+                          ticks2reset = 0.04)
+
+stratvars_parsed_new = AttributeDict(maxpozic = 250,
+                          chunk = 10,
+                          MA = 3,
+                          Trend = 3,
+                          profit = 0.02,
+                          lastbuyindex=-6,
+                          pendingbuys={},
+                          limitka = None,
+                          jevylozeno=0,
+                          vykladka=5,
+                          curve = [0.01, 0.01, 0.01, 0, 0.02, 0.02, 0.01,0.01, 0.01,0.03, 0.01, 0.01, 0.01,0.04, 0.01,0.01, 0.01,0.05, 0.01,0.01, 0.01,0.01, 0.06,0.01, 0.01,0.01, 0.01],
+                          blockbuy = 0,
+                          ticks2reset = 0.04)
+
+
+STRATVARS_UNCHANGEABLES = ['pendingbuys', 'blockbuy', 'jevylozeno', 'limitka']
+
+changed_keys = []
+#get changed values
+for key,value in stratvars_parsed_new.items():
+    if value != stratvars_parsed_old[key]:
+        changed_keys.append(key)
+
+print("changed before check", changed_keys)
+#remove keys that cannot be changed
+for k in changed_keys:
+    if k in STRATVARS_UNCHANGEABLES:
+        print(k, "cant be changed removing")
+        changed_keys.remove(k)
+
+print("clean changed keys", changed_keys)
+
+for k in changed_keys:
+    print("injecting",k, "value", stratvars_parsed_new[k])
diff --git a/testy/gethistorytrades.py b/testy/gethistorytrades.py
index bd0320c..8cfe8ec 100644
--- a/testy/gethistorytrades.py
+++ b/testy/gethistorytrades.py
@@ -4,31 +4,29 @@ print(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from alpaca.data.historical import CryptoHistoricalDataClient, StockHistoricalDataClient
 from alpaca.data.requests import CryptoLatestTradeRequest, StockLatestTradeRequest, StockLatestBarRequest, StockTradesRequest
 from alpaca.data.enums import DataFeed
-from config import API_KEY, SECRET_KEY, MAX_BATCH_SIZE
+from v2realbot.config import ACCOUNT1_PAPER_API_KEY, ACCOUNT1_PAPER_SECRET_KEY
+from v2realbot.utils.utils import zoneNY
 from datetime import datetime, timezone, time, timedelta, date
 import pytz
 from rich import print
 
-#práce s datumy
-
-zone_NY = pytz.timezone('America/New_York')
-
 parametry = {}
 symbol = ["BAC"]
-client = StockHistoricalDataClient(API_KEY, SECRET_KEY, raw_data=True)
-datetime_object_from = datetime(2023, 3, 16, 9, 30, 0, tzinfo=zone_NY)
-datetime_object_to = datetime(2023, 3, 16, 16, 00, 0, tzinfo=zone_NY)
+client = StockHistoricalDataClient(ACCOUNT1_PAPER_API_KEY, ACCOUNT1_PAPER_SECRET_KEY, raw_data=True)
+datetime_object_from = datetime(2023, 4, 12, 15, 45, 8, tzinfo=zoneNY)
+datetime_object_to = datetime(2023, 4, 12, 15, 45, 10, tzinfo=zoneNY)
 trades_request = StockTradesRequest(symbol_or_symbols=symbol, feed = DataFeed.SIP, start=datetime_object_from, end=datetime_object_to)
 
 all_trades = client.get_stock_trades(trades_request)
 
-#print(all_trades)
+print(all_trades)
 
-print(len(all_trades['BAC']))
+# print(len(all_trades['BAC']))
+# print(all_trades['BAC'])
 
 # for i in all_trades:
 #     print(all_trades[i])
 
-if __name__ == "__main__":
-    # bar will be invoked if this module is being run directly, but not via import!
-    print("hello")
\ No newline at end of file
+# if __name__ == "__main__":
+#     # bar will be invoked if this module is being run directly, but not via import!
+#     print("hello")
\ No newline at end of file
diff --git a/v2realbot/ENTRY_backtest_strategyVykladaci.py b/v2realbot/ENTRY_backtest_strategyVykladaci.py
index 98c3edb..5291824 100644
--- a/v2realbot/ENTRY_backtest_strategyVykladaci.py
+++ b/v2realbot/ENTRY_backtest_strategyVykladaci.py
@@ -220,11 +220,11 @@ def main():
     name = os.path.basename(__file__)
     se = Event()
     pe = Event()
-    s = StrategyOrderLimitVykladaci(name = name, symbol = "BAC", account=Account.ACCOUNT2, next=next, init=init, stratvars=stratvars, open_rush=40, close_rush=0, pe=pe, se=se)
-    s.set_mode(mode = Mode.PAPER,
+    s = StrategyOrderLimitVykladaci(name = name, symbol = "BAC", account=Account.ACCOUNT2, next=next, init=init, stratvars=stratvars, open_rush=10, close_rush=0, pe=pe, se=se)
+    s.set_mode(mode = Mode.BT,
                debug = False,
-               start = datetime(2023, 3, 30, 9, 30, 0, 0, tzinfo=zoneNY),
-               end =   datetime(2023, 3, 31, 16, 0, 0, 0, tzinfo=zoneNY),
+               start = datetime(2023, 4, 10, 9, 30, 0, 0, tzinfo=zoneNY),
+               end =   datetime(2023, 4, 10, 9, 35, 0, 0, tzinfo=zoneNY),
                cash=100000)
 
     #na sekundovem baru nezaokrouhlovat MAcko
diff --git a/v2realbot/__pycache__/config.cpython-310.pyc b/v2realbot/__pycache__/config.cpython-310.pyc
index 9de6df8bd49f394c876cb7fd2f51d8a719dc6e3c..62b8a1539097634d70091fa7572dff16a121f54b 100644
GIT binary patch
delta 591
zcmYL_&2G~`6ooym8;>2kBysEfH~~bdM5v$$*dSGvOdGX`Hj6m0n2n*mL*yon(KrQ#
zZTkR3-m-xm3pPYz!#l76B;*A<UVtayPAZWZ&8KsZ&-MJgcm6tdY}=-S<EQrk{!Hu!
z`7&8w-|8u#eIQKdIaoX+j2g<W0y)sn70}OAW?)6Zz{<eN1d}g7o@*~Ou)sdoCU4zM
za9EL(;}UaVnJvQ#TY(aD!DZ!{TY)mGLWR}P^)OpUx4|w$HBg$h$?to&n_8BC$%haP
zdxxjvB%_Ce_^6LEGmrVJ@gRP~hjFG4qLXOUe?Bb|mk=wxq1Nj*-bO4*T#_gtJ}SbM
z+D)ISftN>F!j)JEQ?ba!ET|%%ep7!`FQPJEMr1S$qhT}(LofZhaBaJaUc0G@q72C2
z2uEU7V%|AZvRzaVHC%~?pvn>vmFZROGa>c#`{Jzw`8lJH`M4!SESkEwj)qv1t_IQ3
zNXTB{Nz^4867zj#C)9g<6!!UeH9g3!k&QIT{UTS=eSPn4Ip}u$?o+=LgiqSrdwzSj
z<v-kS1sUD(yMDOys3YWS%nm6wP_gMJ{T;b8-{Aj6GP-#Z!|8x;5zHm`5tdTGx1%a0
I>1*TWKbt&#+yDRo

delta 528
zcmZvYyG|o96o&1IckD@Ka+}-+!g7%)LIedAGzbX+VpoVQ0Bzx7r{D}I+#)%lph6;f
zfyfdS4J8c)c?lkX0_6d=->tXcoKWl*>yba5^ZWPsw||EZVbBhOG{e!Ct8h06rufsK
z*}O?y5IwG?$95Qe0=Lh=?KxUuCqZGSu=Bu6Qjku>v49NteWBA3=nQ1F4>=t`UT2}8
zb5PXzgr6345keh8NtaM9Ls?hGY85KF22~xQI)UCvRK2>Mg4zLVM1!9z!yR7XT-hH^
zz3yRBLwQYx;3FQHDN<duch142#Ik_1LrZDq^N%m@7->c7HTtlUKSYdF9Jel8-8i1G
zzfyCXWz@bkgbB!yCFBUxgugq-6>T>qM1->=5Q=5FDGk4iXU=QZa~Jn$d8Bre>uqD&
zrXkG?3TBp60j;C1sZd`f)Clyef6f^vlqX3yK1;6WY|owNP5bD+@z3^Feu>o9#^FZ1
t^>yFSrN>!J6RXkikG$tg|H(U2YZq;}I#1R)`Z~)9pXKq1lw)7Kg?HbQWFG(k

diff --git a/v2realbot/backtesting/__pycache__/backtester.cpython-310.pyc b/v2realbot/backtesting/__pycache__/backtester.cpython-310.pyc
index c0bdf1a5474011fe64697dfdd3cf275a8f8d9e88..965fe2d79659923990db48d071977b710d9b5831 100644
GIT binary patch
delta 2645
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
ByBGif

delta 2486
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
D8Q+o(

diff --git a/v2realbot/backtesting/backtester.py b/v2realbot/backtesting/backtester.py
index 735e8fd..19b7770 100644
--- a/v2realbot/backtesting/backtester.py
+++ b/v2realbot/backtesting/backtester.py
@@ -43,7 +43,7 @@ from v2realbot.common.model import TradeUpdate, Order
 #from rich import print
 import threading
 import asyncio
-from v2realbot.config import BT_DELAYS
+from v2realbot.config import BT_DELAYS, DATA_DIR
 from v2realbot.utils.utils import AttributeDict, ltp, zoneNY, trunc, count_decimals,print
 from v2realbot.utils.tlog import tlog
 from datetime import datetime, timedelta
@@ -59,7 +59,6 @@ from v2realbot.utils.dash_save_html import make_static
 import dash_bootstrap_components as dbc
 from dash.dependencies import Input, Output
 from dash import dcc, html, dash_table, Dash
-from config import DATA_DIR
 """"
 LATENCY DELAYS
 .000 trigger - last_trade_time (.4246266)
@@ -563,8 +562,18 @@ class Backtester:
         hist_df = hist_df.set_index('time', drop=False)
 
         #indicators
-        ind_df = pd.DataFrame(state.indicators)
-        ind_df = ind_df.set_index('time', drop=False)
+        #TODO vyresit if no indicators or no trades - pada na ValueError protoze pole obsahuje time, ale nikoliv indikatory
+        #zatim jen takto workaround
+        #print(state.indicators)
+        try:
+            ind_df = pd.DataFrame(state.indicators)
+            ind_df = ind_df.set_index('time', drop=False)
+        except ValueError as e:
+            print("Value error", str(e))
+            state.indicators = {'time': [] }
+            ind_df = pd.DataFrame(state.indicators)
+            ind_df = ind_df.set_index('time', drop=False)
+            
         #print("Indicators", ind_df)
         #print(state.indicators)
 
@@ -801,7 +810,7 @@ class Backtester:
             if n_clicks == 0:
                 return 'not saved'
             else:
-                bt_dir = DATADIR + "/backtestresults/" + self.symbol + self.bp_from.strftime("%d-%m-%y-%H-%M-%S") + ' ' + self.bp_to.strftime("%d-%m-%y-%H-%M-%S") + ' ' + str(datetime.now().microsecond)
+                bt_dir = DATA_DIR + "/backtestresults/" + self.symbol + self.bp_from.strftime("%d-%m-%y-%H-%M-%S") + ' ' + self.bp_to.strftime("%d-%m-%y-%H-%M-%S") + ' ' + str(datetime.now().microsecond)
                 make_static(f'http://127.0.0.1:{port}/', bt_dir)
                 return 'saved'
 
diff --git a/v2realbot/config.py b/v2realbot/config.py
index fcc3d50..05a0592 100644
--- a/v2realbot/config.py
+++ b/v2realbot/config.py
@@ -2,6 +2,7 @@ from alpaca.data.enums import DataFeed
 from v2realbot.enums.enums import Mode, Account
 from appdirs import user_data_dir
 
+STRATVARS_UNCHANGEABLES = ['pendingbuys', 'blockbuy', 'jevylozeno', 'limitka']
 DATA_DIR = user_data_dir("v2realbot")
 #BT DELAYS
  
diff --git a/v2realbot/controller/services.py b/v2realbot/controller/services.py
index ce4dff2..646b5b0 100644
--- a/v2realbot/controller/services.py
+++ b/v2realbot/controller/services.py
@@ -6,6 +6,7 @@ from v2realbot.common.model import StrategyInstance, Runner, RunRequest
 from v2realbot.utils.utils import AttributeDict, zoneNY, dict_replace_value, Store, parse_toml_string
 from datetime import datetime
 from threading import Thread, current_thread, Event, enumerate
+from v2realbot.config import STRATVARS_UNCHANGEABLES
 import importlib
 from queue import Queue
 db = Store()
@@ -89,42 +90,68 @@ def delete_stratin(id: UUID):
             return (0, i.id)
     return (-2, "not found")
 
-def inject_stratvars(id: UUID, stratvars_parsed: AttributeDict):
+def inject_stratvars(id: UUID, stratvars_parsed_new: AttributeDict, stratvars_parsed_old: AttributeDict):
     for i in db.runners:
         if str(i.id) == str(id):
-            i.run_instance.state.vars = AttributeDict(stratvars_parsed["stratvars"])
-            i.run_instance.stratvars = AttributeDict(stratvars_parsed["stratvars"])
-            return 0
-    return -2
+            #inject only those changed, some of them cannot be changed (for example pendingbuys)
+
+            changed_keys = []
+            #get changed values
+            for key,value in stratvars_parsed_new.items():
+                if value != stratvars_parsed_old[key]:
+                    changed_keys.append(key)
+
+            #print("changed before check", changed_keys)
+            #remove keys that cannot be changed
+            for k in changed_keys:
+                if k in STRATVARS_UNCHANGEABLES:
+                    #print(k, "cant be changed removing")
+                    changed_keys.remove(k)
+                    return -2, "Stratvar Key "+k+" cannot be changed"
+
+            #print("clean changed keys", changed_keys)
+            #inject clean keys
+            for k in changed_keys:
+                print("INJECTING ",k, "value", stratvars_parsed_new[k])
+                i.run_instance.state.vars[k] = stratvars_parsed_new[k]
+                i.run_instance.stratvars[k] = stratvars_parsed_new[k]
+            return 0, None
+    return -2, "No runners found"
 
 #allows change of set of parameters that are possible to change while it is running
 #also injects those parameters to instance
 def modify_stratin_running(si: StrategyInstance, id: UUID):
-    #validate toml
-    res,stp = parse_toml_string(si.stratvars_conf)
-    if res < 0:
-        return (-1, "stratvars invalid")
-    for i in db.stratins:
-        if str(i.id) == str(id):
-            if not is_stratin_running(id=str(id)):
-                return (-1, "not running")
-            i.id2 = si.id2
-            i.name = si.name
-            i.open_rush = si.open_rush
-            i.stratvars_conf = si.stratvars_conf
-            i.note = si.note
-            i.history = si.history
-            db.save()
-            #TODO reload running strat
-            print(stp)
-            print("starting injection", stp)
-            res = inject_stratvars(id=si.id, stratvars_parsed=stp)
-            if res < 0:
-                print("ajajaj inject se nepovedl")
-                return(-3, "inject failed")
-            return (0, i.id)
-    return (-2, "not found")
-    #controller.reload_params(si)
+    try:
+        #validate toml
+        res,stp = parse_toml_string(si.stratvars_conf)
+        if res < 0:
+            return (-1, "new stratvars format invalid")
+        for i in db.stratins:
+            if str(i.id) == str(id):
+                if not is_stratin_running(id=str(id)):
+                    return (-1, "not running")
+                res,stp_old = parse_toml_string(i.stratvars_conf)
+                if res < 0:
+                    return (-1, "current stratin stratvars invalid")
+                #TODO reload running strat
+                #print(stp)
+                #print("starting injection", stp)
+                res, msg = inject_stratvars(id=si.id, stratvars_parsed_new=stp["stratvars"], stratvars_parsed_old=stp_old["stratvars"])
+                if res < 0:
+                    print("ajajaj inject se nepovedl", msg)
+                    return(-3, "inject failed: " + msg)
+                i.id2 = si.id2
+                i.name = si.name
+                i.open_rush = si.open_rush
+                i.stratvars_conf = si.stratvars_conf
+                i.note = si.note
+                i.history = si.history
+                db.save()
+                return (0, i.id)
+        return (-2, "not found")
+    except Exception as e:
+        return (-2, "Error Exception" + str(e))
+
 
 ##enable realtime chart - inject given queue for strategy instance
 ##webservice listens to this queue
@@ -208,6 +235,7 @@ def capsule(target: object, db: object):
         reason = "SHUTDOWN OK"
     except Exception as e:
         reason = "SHUTDOWN Exception:" + str(e)
+        print(reason)
     finally:
         # remove runners after thread is stopped and save results to stratin history
         for i in db.runners:
diff --git a/v2realbot/loader/__pycache__/aggregator.cpython-310.pyc b/v2realbot/loader/__pycache__/aggregator.cpython-310.pyc
index 5ca646e367087e21afc7470591ada480fa59c7ee..81896677b4d106b455f5c02a47eda2cecd4ee9f6 100644
GIT binary patch
delta 730
zcmZ{iO-~bH5XU?0(r&<AEG)DIUqVPUO@Nd_0-h)sF?x}N#9(-N-0l`%SlK#TxWbk5
zoJ=$(ay2IEkxxMQ29NMHJa}^EX*d9755LSa^UVA+|7Ugeyy_*c+mqq%@7=j*@X=52
z*d5Agc&y=th8Ycu8fG=T)UZrv?k8BFJ#QAC&<{_+Q}X&wp+>r|0y*lv{V)HV=V-g0
zBr#5Nh->7P3cn}vI{>Tnx&M11lI$v@+=G>i7$Z^xi%_C(14q4YOrI&yvOh8-9olN{
zw#s(9<CRHZBgI&5y%kIes)9AfJ^Jd;@2|^oL$JxvIi;c`R0_K!r39AXHA7oz3(=9I
zY=D8Fy?|6*rNTH!)36c8Jiv$<7;PgP@;x6inN)^285@?mZND2s`jEfVg>^a@T)8D{
z>ukLh1+9QaoiRG;FHK^Dv$)0J{mkx0H<j!)pHlYe!SL0UrJ=&w_?`}je${KzI?pIO
z?SW#6nT6XDJro%0L_}wUX0x#qU2@lEcc*T&caFXkYFF&VM5cDI7Mmhs$M4wT4&LHN
s>FeYua$)?Eqn7WWWXmJ0M(f2*i0HU@A7c7boXE-xAoBnA%*y)3|3=!HQ~&?~

delta 729
zcmZ{iF>ljQ6oqrK8%(6Q7(1<LsZd3w%0j4Viby9?0gC9vMj=2=;-pn*WxLm5=){b~
zg6@D=0D;(83S*`I0e%3|lM26qm5Fy83Q7SFM}FtNd#>(hAJ$aOPRiv{K|e3PU+Lam
z-m~}1Zc)*7MYj}PR&-5KUD0j%R(?q<vTN7rhV0oPHN_eKObt04uToL$(?6V59iq%m
zl5F#me&v=pXD2^ZotS7%UZ43e6~SH85|p@l^v-Z))|!*2?lk%G-hJ2FK(TdnLzVhj
zKh6g2IO_4dc9j_=>2BVrjP&s!Fo$t>P&2rf@fLbFA&Zb21bH*^)@wBH;dmeNK#MvV
zhTS9zLp}j(9b!O26pd`aY~hIY_#x!icJq~)*?dMG-_aG93WW@pt%6BS(;MTCq|Uih
z+}2*;Do>tIc=D>Utbu%~+^lwy)<ezYeCIrw;r@jQuEum>>iAyhS<r*IFV7}Eb{gou
zswJ?7nZG&mBa{Ge$Onn4*iO@4+#Nw^YJ`jbWmuOtlPga~8FGx&fAHf3L(J{I#&{ec
xT2e^<jdJ;eb4M30j^H#ri{S>-dYXj(Iz@8epQkPP>R&1XKkw*2Zq*p`{GU%2nKJ+Y

diff --git a/v2realbot/loader/aggregator.py b/v2realbot/loader/aggregator.py
index 3b7fec6..41271c0 100644
--- a/v2realbot/loader/aggregator.py
+++ b/v2realbot/loader/aggregator.py
@@ -77,10 +77,11 @@ class TradeAggregator:
         #print(data)
         ##implementing fitlers - zatim natvrdo a jen tyto: size: 1, cond in [O,C,4] opening,closed a derivately priced,
         ## 22.3. - dal jsem pryc i contingency trades [' ', '7', 'V'] - nasel jsem obchod o 30c mimo
+        ## dán pryč P - prior reference time + 25centu mimo, {'t': '2023-04-12T19:45:08.63257344Z', 'x': 'D', 'p': 28.68, 's': 1000, 'c': [' ', 'P'], 'i': 71693108525109, 'z': 'A'},
         ## Q - jsou v pohode, oteviraci trady, ale O jsou jejich duplikaty
         try:
             for i in data['c']:
-                if i in ('C','O','4','B','7','V'): return 0
+                if i in ('C','O','4','B','7','V','P'): return 0
         except KeyError:
             pass
 
diff --git a/v2realbot/static/index.html b/v2realbot/static/index.html
index fa1ac66..9f1a47c 100644
--- a/v2realbot/static/index.html
+++ b/v2realbot/static/index.html
@@ -228,7 +228,7 @@
                                     </div>
                                     <div class="form-group">
                                         <label for="cash" class="control-label">cash</label>							
-                                        <input type="number" class="form-control" id="cash" name="cash" placeholder="cash" value=0>							
+                                        <input type="number" class="form-control" id="cash" name="cash" placeholder="cash" value="100000">							
                                     </div>	 			
                                 </div>
                                 <div class="modal-footer">
diff --git a/v2realbot/static/js/mywebsocket.js b/v2realbot/static/js/mywebsocket.js
index 2bb59bf..445df34 100644
--- a/v2realbot/static/js/mywebsocket.js
+++ b/v2realbot/static/js/mywebsocket.js
@@ -3,7 +3,7 @@ var ws = null;
 function connect(event) {
     var runnerId = document.getElementById("runnerId")
     try {
-        ws = new WebSocket("ws://localhost:8000/runners/" + runnerId.value + "/ws?api_key=" + API_KEY);
+        ws = new WebSocket("ws://"+ window.location.hostname +":8000/runners/" + runnerId.value + "/ws?api_key=" + API_KEY);
     }
     catch (err) {
         console.log("nejaky error" + err)
diff --git a/v2realbot/utils/__pycache__/dash_save_html.cpython-310.pyc b/v2realbot/utils/__pycache__/dash_save_html.cpython-310.pyc
index 410b6caafdcb3238a45f8b563f5ffa3e2907ad32..0f8f8a6d20eb9912aef1e813d3ae32ab8b9505ea 100644
GIT binary patch
delta 38
scmZ1^vqpwDpO=@50SF>EEK))?@~-0L7AP|+N=?j3$}iEIyn{Cj0I;+QhyVZp

delta 28
icmZ1@vq*+FpO=@50SIP%HcRo^$h(S{k!|uJ-YfuWN(bHm

diff --git a/v2realbot/utils/__pycache__/utils.cpython-310.pyc b/v2realbot/utils/__pycache__/utils.cpython-310.pyc
index 41ef8a4e0123bec66b230ee4de19ddc041afaa0a..d50c4588b4e590c1b407d558e3d1aac07c482752 100644
GIT binary patch
delta 1029
zcmZ{jT}TvB6vyW}?##F!x*zK9nry7*uB%{BVqb(*_7M41LfK+1<L+pS>&$v*Tt5gk
zNGUZWj!{_>K`%Z<2+@nsb40yG+<LKxK&T#liJ*JNk_Z~OKhFK%bI!f@+%pR;cUwG$
z$Kw?E_oMo7X8yV7kb@-Qw8J8Gu<0*ff9sG5Veno$O5)&?UvqwvkC6m~l*VYBhtUAS
z$HB@{DOJ}EOSQ6wZl+SS9x_Ti9OG+se3-b6Q}7ZmaT2#gWAIeDMH1^xC3i@e$!%IX
zJFMnt4W?35Gi8nDa~gvW&KINumRz4nCs20->4jDIS*eSA(Qf$e?j~ty^~@hUhr)S8
zC!z;&0YMNK5tk52L?1$hO*sH%r2#2}Q*FJzw31B!FGWIR%9y4NWz-3i_F@30%YKms
zVav^}tq^J_5Lv{oOTs}fqi_WwAruZK|4x<=sePAz6qT#6QFeyt>$2BLA_H7n6PcLP
zbSA2~91|zA`8AOmm?RJTea+D+Zl;Sk{(K@g_>qKDe9#d=fP%LfUivB{6osl?>_Mx*
zF@we!eDy_LxE~!yT(e8l=r5I~aXJI7{+<wX>8fs+TH4SvCUXqr4An{ydfoQj@Yj-A
z-Z8@!b36ivDRC%5F;NJegLI&mwA-HV0)Db!_tth`n~+8LR<XKw3AeG&w8*X7e}|Ws
z&_!6Qe8bza5Nsf|@FW-^HSj7}Apu4$!^dEh%Rhs0&brXO_6I1hAnqe-5q4KeYCf;&
z8U7-VQCmhlL_9+5L;O>r6;Q&_n4Rl5U*^}v?n)d<x`xfcyqX?r(#9={4?u51SGZng
z#rX+qlEG9s!VkO}rqj$@I6yTu*Kb%&ymSNEL0XRf)d)Nm#h-)5IFdypqs%d=S=QuE
zyWGH)HV!6cb&H<FX$K;W&=5MpzA^R!ok7eZ@D1pKz}s@C3|QEmTG-dAvLEAFRo^eY
Crt_8n

delta 1010
zcmZ{jT}TvB6oBV8?##G9x<BgfT5K$<?vG#(iBS<!*@Hi&VD>XX>$p4G>hA1zXEfa`
zR|1!elDMfs_#pJ+V=P23LeCNP7BTf=L?Bf3<Xg}=V@U*ExF6@9d(OG%oH?`Haj(Ob
zce(5wtj|9>(xqpvBQ|2PGd6>?uq|(0<&8}wL}u@VV<g5r;w#`s@i<AafYcg}fgAN9
zJOHycnN&0_Zzx74uj$DojkB~A4MyRv8Mcnk*f}?G6FYGVG|HYzcS)ksR{f9!WwA?5
zWpYZEM!-sz6g_E77P6|$-rJv(9=7E8M0y!@Cdd$5bM^{-U`5Ze@6G`-%sO3*htHv+
zAJK~#Knx-X;ymI4;v(WQ;wsw`eXO>|Cn$Ivsl;j;$lU)z#CcP?p{f&UWk#n%=z!re
zUqp`Ec7n7WK;22iC}PhfZlf|Pt{?=21Te+l!Qwo%YDt1pmaehQ+HNvl5#4qYN`Y#F
zH~FlpnY@zCntU-+*x=~|2FbERp7wAN#MC~(pT&a!DRHM^(;UaKDR(=2;b{nIsA$~7
zev~Mngo4h#dcqETj~a++t2M3O8sR1$XIZCrFd#cLMa%1IDzBw=(>9vTD@L5qTbAvn
zH$qA<F}eDA@K}JYW33WbMI=J!S;}{bbX%5heO|I)&DM@@hmbP+R=;*|5udSgDuZ<Y
zZ}+-tT4oy!uVE~w{0Y*;*8L$8VK4pl!UObLVjuirQ2+Etfz5%{zGYOeARZx_5D|bW
zD20NmrQwS_LERE!74aB>Gx~3bR+tnFw^*@Gz%`VM(-l7|J97G1K}k)tsnZ6<4?yp*
z{$Na$s|qtlQD(P;AxL;FNath$8aA34qjhL?0D;NS76kqq^1kbnvTaN?jN<N)%;8NJ
tz~nQUK~Lea2QiEoL5w4;I&lK%ETV+K?o(|4ZtZ2R8bqrDD{Q^d_yw4e>AnB}

diff --git a/v2realbot/utils/dash_save_html.py b/v2realbot/utils/dash_save_html.py
index ada39b8..f79cad3 100644
--- a/v2realbot/utils/dash_save_html.py
+++ b/v2realbot/utils/dash_save_html.py
@@ -3,7 +3,7 @@ import os
 import requests
 from html.parser import HTMLParser
 import requests
-from config import DATA_DIR
+from v2realbot.config import DATA_DIR
 
 def patch_file(file_path: str, content: bytes, extra: dict = None) -> bytes:
     if file_path == 'index.html':
diff --git a/v2realbot/utils/utils.py b/v2realbot/utils/utils.py
index 844a056..066db32 100644
--- a/v2realbot/utils/utils.py
+++ b/v2realbot/utils/utils.py
@@ -13,7 +13,7 @@ import os
 from v2realbot.common.model import StrategyInstance, Runner
 from typing import List
 import tomli
-from config import DATA_DIR
+from v2realbot.config import DATA_DIR
 
 #datetime to timestamp
 def json_serial(obj):