From 37131dd15614399888e2746fe2cb0a2887815f7c Mon Sep 17 00:00:00 2001 From: adonunes Date: Fri, 15 Nov 2024 09:09:32 -0500 Subject: [PATCH] ibkr sto filled --- DiscordAlertsTrader/alerts_trader.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/DiscordAlertsTrader/alerts_trader.py b/DiscordAlertsTrader/alerts_trader.py index bd42b64..33c954c 100644 --- a/DiscordAlertsTrader/alerts_trader.py +++ b/DiscordAlertsTrader/alerts_trader.py @@ -76,12 +76,12 @@ def __init__(self, self.max_stc_orders = int(cfg['order_configs']['max_stc_orders']) + 1 # load port and log if op.exists(self.portfolio_fname): - self.portfolio = pd.read_csv(self.portfolio_fname) + self.portfolio = pd.read_csv(self.portfolio_fname, na_values=['']) else: self.portfolio = pd.DataFrame(columns=self.cfg["col_names"]['portfolio'].split(",") ) self.portfolio.to_csv(self.portfolio_fname, index=False) if op.exists(self.alerts_log_fname): - self.alerts_log = pd.read_csv(self.alerts_log_fname) + self.alerts_log = pd.read_csv(self.alerts_log_fname, na_values=['']) else: self.alerts_log = pd.DataFrame(columns=self.cfg["col_names"]['alerts_log'].split(",")) self.alerts_log.to_csv(self.alerts_log_fname, index=False) @@ -1028,7 +1028,14 @@ def new_trade_alert(self, order:dict, pars:str, msg): order_status, order_info = self.get_order_info(order_id) self.portfolio.loc[open_trade, STC + "-ordID"] = order_id self.portfolio.loc[open_trade, STC + "-Price-actual"] = order["price_actual"] - + + if order_info is None and self.bksession.name == "ibkr": + order_status = "FILLED" + order_info = order + order_info['quantity'] = order['Qty'] + order_info['filledQuantity'] = order['Qty'] + print("IBKR order was None, assuming filled") + # Check if STC price changed if order_status in ["FILLED", 'EXECUTED', 'INDIVIDUAL_FILLS']: self.disc_notifier(order_info)