From e75fbc7194877dc5794238292fb06a3a0c41a9fd Mon Sep 17 00:00:00 2001 From: David Brazda Date: Fri, 23 Feb 2024 21:04:23 +0700 Subject: [PATCH] bugfix --- v2realbot/controller/services.py | 2 +- v2realbot/loader/trade_ws_streamer.py | 4 +++- v2realbot/main.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/v2realbot/controller/services.py b/v2realbot/controller/services.py index 368e3d7..8c11029 100644 --- a/v2realbot/controller/services.py +++ b/v2realbot/controller/services.py @@ -1947,7 +1947,7 @@ def get_alpaca_history_bars(symbol: str, datetime_object_from: datetime, datetim client = StockHistoricalDataClient(ACCOUNT1_LIVE_API_KEY, ACCOUNT1_LIVE_SECRET_KEY, raw_data=False) #datetime_object_from = datetime(2023, 2, 27, 18, 51, 38, tzinfo=datetime.timezone.utc) #datetime_object_to = datetime(2023, 2, 27, 21, 51, 39, tzinfo=datetime.timezone.utc) - bar_request = StockBarsRequest(symbol_or_symbols=symbol,timeframe=timeframe, start=datetime_object_from, end=datetime_object_to, feed=ACCOUNT1_LIVE_API_KEY) + bar_request = StockBarsRequest(symbol_or_symbols=symbol,timeframe=timeframe, start=datetime_object_from, end=datetime_object_to, feed=ACCOUNT1_LIVE_FEED) #print("before df") bars = client.get_stock_bars(bar_request) result = [] diff --git a/v2realbot/loader/trade_ws_streamer.py b/v2realbot/loader/trade_ws_streamer.py index 2df97af..99f4d0d 100644 --- a/v2realbot/loader/trade_ws_streamer.py +++ b/v2realbot/loader/trade_ws_streamer.py @@ -21,7 +21,8 @@ from msgpack import packb class Trade_WS_Streamer(Thread): ##tento ws streamer je pouze jeden pro vsechny, tzn. vyuziváme natvrdo placena data primarniho uctu (nezalezi jestli paper nebo live) - print(f"Realtime Websocket connection will use FEED: {LIVE_DATA_FEED} and credential of ACCOUNT1") + msg = f"Realtime Websocket connection will use FEED: {LIVE_DATA_FEED} and credential of ACCOUNT1" + print(msg) client = StockDataStream(LIVE_DATA_API_KEY, LIVE_DATA_SECRET_KEY, raw_data=True, websocket_params={}, feed=LIVE_DATA_FEED) #uniquesymbols = set() _streams = [] @@ -39,6 +40,7 @@ class Trade_WS_Streamer(Thread): return False def add_stream(self, obj: TradeAggregator2Queue): + print(Trade_WS_Streamer.msg) print("stav pred pridavanim", Trade_WS_Streamer._streams) Trade_WS_Streamer._streams.append(obj) if Trade_WS_Streamer.client._running is False: diff --git a/v2realbot/main.py b/v2realbot/main.py index 4cb2654..9535239 100644 --- a/v2realbot/main.py +++ b/v2realbot/main.py @@ -252,7 +252,7 @@ def _run_stratin(stratin_id: UUID, runReq: RunRequest): runReq.bt_to = zoneNY.localize(runReq.bt_to) #pokud jedeme nad test intervaly anebo je požadováno více dní - pouštíme jako batch day by day #do budoucna dát na FE jako flag - print(runReq) + #print(runReq) if runReq.mode not in [Mode.LIVE, Mode.PAPER] and (runReq.test_batch_id is not None or (runReq.bt_from is not None and runReq.bt_to is not None and runReq.bt_from.date() != runReq.bt_to.date())): res, id = cs.run_batch_stratin(id=stratin_id, runReq=runReq) else: