Skip to content

Commit

Permalink
Merge pull request #66 from iamkrish-coder/develop
Browse files Browse the repository at this point in the history 
Fix all exceptions and print the formatted exception string #65
  • Loading branch information
@iamkrish-coder
iamkrish-coder committed Jul 23, 2023
2 parents 4321786 + 0ff5f40 commit 749b72a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 30 deletions.
8 changes: 4 additions & 4 deletions IntelliTrader/IntelliTrader.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@
for old_access_token_file in old_access_token_files:
try:
os.remove(old_access_token_file)
except:
trace.error("Error while deleting file : ", old_access_token_file)
except Exception as e:
trace.error("An exception occurred: {}".format(e))
exit()

old_request_token_files = glob.glob('./src/output/request_token*.txt')
for old_request_token_file in old_request_token_files:
try:
os.remove(old_request_token_file)
except:
trace.error("Error while deleting file : ", old_request_token_file)
except Exception as e:
trace.error("An exception occurred: {}".format(e))
exit()

# Begin a new connection
Expand Down
8 changes: 4 additions & 4 deletions IntelliTrader/src/fetch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def instrument_token_lookup(self, exchange, symbol):
instrument_token = instrument_df[instrument_df.tradingsymbol == symbol].instrument_token.values[0]
self.prop['log'].info('Instrument token %d obtained for symbol %s', instrument_token, symbol)
return instrument_token
except:
self.prop['log'].warning('Please verify that the symbol name [%s] is present in the specified exchange.' %(symbol))
except Exception as e:
self.prop['log'].warning("An exception occurred: {}".format(e))
exit()
else:
self.prop['log'].warning('Please verify that the echange [%s] and symbol [%s] are present.' %(exchange) %(symbol))
Expand All @@ -45,8 +45,8 @@ def stream_instrument_token_lookup(self, exchange, symbol_list):
for symbol in symbol_list:
token_list.append(int(instrument_df[instrument_df.tradingsymbol == symbol].instrument_token.values[0]))
return token_list
except:
self.prop['log'].warning('Please verify that the symbol name [%s] is present in the specified exchange.' %(symbol))
except Exception as e:
self.prop['log'].warning("An exception occurred: {}".format(e))
exit()
else:
self.prop['log'].warning('Please verify that the echange [%s] and symbol_list [%s] are present.' %(exchange) %(symbol_list))
Expand Down
40 changes: 20 additions & 20 deletions IntelliTrader/src/indicator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ def option_macd(self, dataset):
else:
self.prop['log'].error("Failed to calculate MACD")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_rsi(self, dataset):
try:
Expand All @@ -83,8 +83,8 @@ def option_rsi(self, dataset):
else:
self.prop['log'].error("Failed to calculate RSI")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_atr(self, dataset):
try:
Expand All @@ -100,8 +100,8 @@ def option_atr(self, dataset):
else:
self.prop['log'].error("Failed to calculate ATR")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_sma(self, dataset):
try:
Expand All @@ -117,8 +117,8 @@ def option_sma(self, dataset):
else:
self.prop['log'].error("Failed to calculate SMA")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_ema(self, dataset):
try:
Expand All @@ -134,8 +134,8 @@ def option_ema(self, dataset):
else:
self.prop['log'].error("Failed to calculate EMA")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_williams_r(self, dataset):
try:
Expand All @@ -151,8 +151,8 @@ def option_williams_r(self, dataset):
else:
self.prop['log'].error("Failed to calculate Williams Range")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_vwap(self, dataset):
try:
Expand All @@ -168,8 +168,8 @@ def option_vwap(self, dataset):
else:
self.prop['log'].error("Failed to calculate VWAP")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_adx(self, dataset):
try:
Expand All @@ -185,8 +185,8 @@ def option_adx(self, dataset):
else:
self.prop['log'].error("Failed to calculate ADX")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_stochastic(self, dataset):
try:
Expand All @@ -206,8 +206,8 @@ def option_stochastic(self, dataset):
else:
self.prop['log'].error("Failed to calculate Stochastic")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def option_renko(self, dataset, period):
try:
Expand All @@ -223,8 +223,8 @@ def option_renko(self, dataset, period):
else:
self.prop['log'].error("Failed to calculate Renko")
return False
except:
self.prop['log'].error("The received object is not a valid DataFrame")
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))

def invalid_option(self, dataset):
# Invalid indicator option provided
Expand Down
2 changes: 0 additions & 2 deletions IntelliTrader/src/strategy.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from src.helper import Helper
import src.strategies.options as options
import traceback

class Strategy:
def __init__(self, params):
Expand Down Expand Up @@ -44,7 +43,6 @@ def init_options(self, common_utils, user_input):
return False
except Exception as e:
self.prop['log'].error("An exception occurred: {}".format(e))
traceback.print_exc()


def invalid_option(self, common_utils, user_input):
Expand Down

0 comments on commit 749b72a

Please sign in to comment.