bitunix-automated-crypto-trading 3.1.5__tar.gz → 3.1.7__tar.gz

{bitunix_automated_crypto_trading-3.1.5 → bitunix_automated_crypto_trading-3.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitunix_automated_crypto_trading
-Version: 3.1.5
+Version: 3.1.7
 Summary: Bitunix Futures Auto Trading Platform
 Home-page: https://github.com/tcj2001/bitunix-automated-crypto-trading
 Author: tcj2001

{bitunix_automated_crypto_trading-3.1.5 → bitunix_automated_crypto_trading-3.1.7}/README.md

@@ -26,6 +26,7 @@ A real-time cryptocurrency trading platform built with FastAPI and WebSocket tec
   - MACD
   - Bollinger Bands
   - RSI
+  - Support and Resistance levels
   - Brearish or bullish candle based on the close near high or low of the current candle
   - strength based on consecutive colored candles count
   - ADX
@@ -48,6 +49,7 @@ A real-time cryptocurrency trading platform built with FastAPI and WebSocket tec
 The platform can be configured through the `config.py` file or `config.txt`. Key configuration parameters include:
 - Trading Parameters:
   - `AUTOTRADE` : True or False
+  - `TICKERS`: supply a list of tickers seperated by comma to trade, e.g., "BTCUSDT,ETHUSDT" or "" to auto select based on MIN_VOLUME and THRESHOLD
   - `LEVERAGE`: Trading leverage (1-100)
   - `THRESHOLD`: Ticker selection based close near high or low of the day
   - `MIN_VOLUME`: Ticker selection based on Minimum trading volume
@@ -59,6 +61,7 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
   - `BARS`: Number of bars to use for study and charting
     
   - `Technical Indicators Parameters`:
+    - `BOS_PERIOD`: Break of structure period, number of bars to look back to determine the previous high or low
     - `MA_FAST`: Fast moving average period
     - `MA_MEDIUM`: Medium moving average period
     - `MA_SLOW`: Slow moving average period
@@ -72,6 +75,7 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
     - `ADX_PERIOD`: ADX period
     
   - `Study Parameters`:
+    - `BOS_STUDY`: Enable Break Of Structure study
     - `EMA_STUDY`: Enable EMA study
     - `EMA_CHART`: Display EMA chart
     - `EMA_STUDY`: Enable EMA study
@@ -98,9 +102,11 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
     - `RSI_CHECK_ON_OPEN`: Check RSI on open
     - `RSI_CHECK_ON_CLOSE`: Check RSI on close
 
+    - `TRENDLINE_PEAK_DISTANCE` : distance between peaks or troughs
     - `TRENDLINE_STUDY`: Enable Trendline support and resistance study
     - `TRENDLINE_CHART`: Display Trendline chart
     - `TRENDLINE_LOOKBACK`: Lookback period for trendline study
+    - `TRENDLINE_BREAKOUT`: Check if breakout from support or resistance line
     - `TRENDLINE_CHECK_ON_OPEN`: Check Trendline support and resistance on open
     - `TRENDLINE_CHECK_ON_CLOSE`: Check Trendline support and resistance on close
 
@@ -155,6 +161,7 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
       - Max auto trades
       - Take Profit amount
       - Accept Loss amount
+    - BOS study is basically when the price breakout from the previous high or low
     - You can control the study like Moving Average, MACD, Bollinger Band, RSI or close proximity to high or low of the candle using the env file
     - You can control the trading strategy using the CalculateStudy function in TickerManager.py and AutoTradeProcess function in BitunixSignal.py
     - Changes are activated by unchecking and checking the AutoTrade checkbox

{bitunix_automated_crypto_trading-3.1.5 → bitunix_automated_crypto_trading-3.1.7}/bitunix_automated_crypto_trading/BitunixSignal.py

@@ -99,19 +99,23 @@ class BitunixSignal:
         self.tickerObjects.update_settings(settings)
         
     async def load_tickers(self):
-        symbols = await self.bitunixApi.GetTickerList(float(self.settings.THRESHOLD), float(self.settings.MIN_VOLUME))
-        self.pendingPositions= await self.bitunixApi.GetPendingPositionData()
-        self.pendingOrders= await self.bitunixApi.GetPendingOrderData()
-        olist=[]
-        plist=[]
-        if self.pendingPositions:
-            plist = [entry['symbol'] for entry in self.pendingPositions]
-        if self.pendingOrders['orderList']:
-            olist = [entry['symbol'] for entry in self.pendingOrders['orderList']]
-        newlist=olist+plist+list(set(symbols))
-        self.tickerList=newlist[:300]
-        self.tickerList.remove("STMXUSDT")
-        #self.tickerList=['POLUSDT']
+        if self.settings.TICKERS=="":
+            symbols = await self.bitunixApi.GetTickerList(float(self.settings.THRESHOLD), float(self.settings.MIN_VOLUME))
+            self.pendingPositions= await self.bitunixApi.GetPendingPositionData()
+            self.pendingOrders= await self.bitunixApi.GetPendingOrderData()
+            olist=[]
+            plist=[]
+            if self.pendingPositions:
+                plist = [entry['symbol'] for entry in self.pendingPositions]
+            if self.pendingOrders['orderList']:
+                olist = [entry['symbol'] for entry in self.pendingOrders['orderList']]
+            newlist=olist+plist+list(set(symbols))
+            self.tickerList=newlist[:300]
+            self.tickerList.remove("STMXUSDT")
+            #self.tickerList=['POLUSDT']
+        else:
+            self.tickerList = self.settings.TICKERS.split(",")
+            self.tickerList = [sym.strip().upper() for sym in self.tickerList if sym.strip()]
 
         [await self.add_ticker_to_tickerObjects(sym) for sym in self.tickerList]
         self.notifications.add_notification(f"{len(self.tickerList)} ticker list loaded") 
@@ -559,11 +563,16 @@ class BitunixSignal:
             self.signaldf_filtered = self.tickerObjects.signaldf_filtered
 
             if not self.positiondf.empty and not self.signaldf_full.empty:
-                    columns=['symbol', f"{period}_trend", f"{period}_cb", f"{period}_barcolor", f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", f"{period}_trendline", f"{period}_candle_trend", f"{period}_open", f"{period}_close", f"{period}_high", f"{period}_low"]
+                    columns=['symbol', f"{period}_trend", f"{period}_cb", f"{period}_barcolor", 
+                             f"{period}_bos",
+                             f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", f"{period}_trendline", f"{period}_candle_trend", f"{period}_open", f"{period}_close", f"{period}_high", f"{period}_low"]
                     columns2=["qty", "side", "unrealizedPNL", "realizedPNL", "ctime", "avgOpenPrice", "bid", "bidcolor", "last", "lastcolor", "ask", "askcolor", "charts", "bitunix", "action", "add", "reduce"]
                     if set(columns).issubset(self.signaldf_full.columns) and set(columns2).issubset(self.positiondf.columns):
-                        columnOrder= ['symbol', "side",  "unrealizedPNL", "realizedPNL", f"{period}_trend", f"{period}_cb", f"{period}_barcolor", f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", f"{period}_trendline", f"{period}_adx", f"{period}_candle_trend", f"{period}_open", f"{period}_close", f"{period}_high", f"{period}_low", "qty", "ctime", "avgOpenPrice", "bid", "bidcolor", "last", "lastcolor", "ask", "askcolor", "charts", "bitunix", "action", "add", "reduce"]                
+                        columnOrder= ['symbol', "side",  "unrealizedPNL", "realizedPNL", f"{period}_trend", f"{period}_cb", f"{period}_barcolor", 
+                                      f"{period}_bos",
+                                      f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", f"{period}_trendline", f"{period}_adx", f"{period}_candle_trend", f"{period}_open", f"{period}_close", f"{period}_high", f"{period}_low", "qty", "ctime", "avgOpenPrice", "bid", "bidcolor", "last", "lastcolor", "ask", "askcolor", "charts", "bitunix", "action", "add", "reduce"]                
                         self.positiondf2 = pd.merge(self.positiondf, self.signaldf_full[["symbol", f"{period}_open", f"{period}_close", f"{period}_high", f"{period}_low", 
+                                f"{period}_bos",                                                               
                                 f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", f"{period}_trendline", f"{period}_adx", f"{period}_candle_trend",
                                 f"{period}_trend",f"{period}_cb", f"{period}_barcolor"]], left_on="symbol", right_index=True, how="left")[columnOrder]    
                         self.positiondfStyle= self.positiondfrenderer.render_html(self.positiondf2)
@@ -578,6 +587,7 @@ class BitunixSignal:
                     # Assign to self.signaldf for HTML rendering
                     self.signaldf = self.signaldf_filtered[[
                         "symbol", f"{period}_trend",f"{period}_cb", f"{period}_barcolor",
+                        f"{period}_bos",
                         f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", f"{period}_trendline",f"{period}_adx",f"{period}_candle_trend",
                         'lastcolor', 'bidcolor', 'askcolor', 'bid', 'last', 'ask',
                         f"{period}_open", f"{period}_close", f"{period}_high", f"{period}_low", 
@@ -640,7 +650,7 @@ class BitunixSignal:
                     #open position upto a max of max_auto_trades from the signal list
                     df=self.signaldf.copy(deep=False)
                     for index, row in df.iterrows():
-                        side = "BUY" if row[f'{period}_barcolor'] == self.green else "SELL" if row[f'{period}_barcolor'] == self.red else ""
+                        side = "BUY" if row[f'{period}_barcolor'] == self.green and row[f'{period}_trend'] == "BUY"  else "SELL" if row[f'{period}_barcolor'] == self.red and row[f'{period}_trend'] == "SELL" else ""
                         if side != "":
                             select = True
                             self.pendingPositions = await self.bitunixApi.GetPendingPositionData({'symbol': row.symbol})
@@ -945,8 +955,8 @@ class BitunixSignal:
                                     continue
 
                             # candle reversed
-                            if self.settings.CANDLE_TREND_STUDY and self.settings.CANDLE_TREND_CHECK_ON_CLOSE:
-                                if row.side == 'BUY' and self.signaldf_full.at[row.symbol, f'{period}_barcolor'] == self.red and self.signaldf_full.at[row.symbol, f'{period}_candle_trend'] == "BEARISH":
+                            if self.settings.CANDLE_TREND_STUDY and self.settings.CANDLE_TREND_REVERSAL_CHECK_ON_CLOSE:
+                                if row.side == 'BUY' and self.signaldf_full.at[row.symbol, f'{period}_barcolor'] == self.red and self.signaldf_full.at[row.symbol, f'{period}_cb'] > 1 and self.signaldf_full.at[row.symbol, f'{period}_candle_trend'] == "BULLISH":
                                     last, bid, ask, mtv = await self.GetTickerBidLastAsk(row.symbol)
                                     price = (ask if row['side'] == "BUY" else bid if row['side'] == "SELL" else last) if bid<=last<=ask else last
 
@@ -963,7 +973,7 @@ class BitunixSignal:
                                     )
                                     continue
 
-                                if row.side == 'SELL' and self.signaldf_full.at[row.symbol, f'{period}_barcolor'] == self.green  and self.signaldf_full.at[row.symbol, f'{period}_candle_trend'] == "BULLISH":
+                                if row.side == 'SELL' and self.signaldf_full.at[row.symbol, f'{period}_barcolor'] == self.green and self.signaldf_full.at[row.symbol, f'{period}_cb'] > 1 and self.signaldf_full.at[row.symbol, f'{period}_candle_trend'] == "BULLISH":
                                     last, bid, ask, mtv = await self.GetTickerBidLastAsk(row.symbol)
                                     price = (ask if row['side'] == "BUY" else bid if row['side'] == "SELL" else last) if bid<=last<=ask else last
 
@@ -982,7 +992,7 @@ class BitunixSignal:
 
                     await asyncio.sleep(0)
             
-                self.lastAutoTradeTime = time.time()
+            self.lastAutoTradeTime = time.time()
         except Exception as e:
             stack = traceback.extract_stack()
             function_name = stack[-1].name

{bitunix_automated_crypto_trading-3.1.5 → bitunix_automated_crypto_trading-3.1.7}/bitunix_automated_crypto_trading/TickerManager.py

@@ -63,6 +63,23 @@ class Interval:
                 # Get the last color and its consecutive count
                 self.signal_strength = df['Consecutive'].iloc[-1]
 
+                # Break of Strcuture
+                if self.settings.BOS_STUDY:
+                    if df['high'].size > 1 and df['low'].size > 1 and df['close'].size > 1:
+                        high = talib.MAX(df.iloc[:-1]['high'].values, timeperiod=self.settings.BOS_PERIOD)[-1]
+                        low = talib.MIN(df.iloc[:-1]['low'].values, timeperiod=self.settings.BOS_PERIOD)[-1]
+                        close = df['close'].iloc[-1]
+                        if close > high:
+                            self.bos_signal = "BUY"
+                        elif close < low:
+                            self.bos_signal = "SELL"
+                        else:
+                            self.bos_signal = "HOLD"
+                    else:
+                        self.bos_signal = "HOLD"
+                else:
+                    self.bos_signal = "HOLD"
+
                 # Calculate the Moving Averages
                 if self.settings.EMA_STUDY:
                     df['ma_fast'] = talib.EMA(df['close'], timeperiod=self.settings.MA_FAST)
@@ -116,6 +133,14 @@ class Interval:
                             else:
                                 self.ema_open_signal = "HOLD"
                                 self.ema_close_signal = "HOLD"
+
+                            if self.settings.EMA_CLOSE_ON_FAST_MEDIUM:
+                                if df['close'].iloc[-1] > df['ma_fast'].iloc[-1] and df['ma_fast'].iloc[-1] > df['ma_medium'].iloc[-1]:
+                                    self.ema_close_signal = "BUY"
+                                elif df['close'].iloc[-1] < df['ma_fast'].iloc[-1] and df['ma_fast'].iloc[-1] < df['ma_medium'].iloc[-1]:
+                                    self.ema_close_signal = "SELL"
+                                else:
+                                    self.ema_close_signal = "HOLD"
                 else:
                     # Drop EMA columns if not used
                     df.drop(['ma_fast', 'ma_medium', 'ma_slow', 'ma_slope', 'ma_angle'], axis=1, inplace=True, errors='ignore')
@@ -233,16 +258,20 @@ class Interval:
                         df.fillna({'support_line':0}, inplace=True)
                         df.fillna({'resistance_line':0}, inplace=True)
                         if df is not None and len(df) >= 2:
-                            if df['high'].iloc[-3] >= df['support_line'].iloc[-3] and df['close'].iloc[-2] < df['support_line'].iloc[-2] and df['close'].iloc[-1] < df['open'].iloc[-1]:
-                                self.trendline_signal = "SELL"
-                            elif df['low'].iloc[-3] <= df['resistance_line'].iloc[-3] and df['close'].iloc[-2] > df['resistance_line'].iloc[-2] and df['close'].iloc[-1] > df['open'].iloc[-1]:
-                                self.trendline_signal = "BUY"
-                            elif df['close'].iloc[-3] > df['support_line'].iloc[-3] and df['close'].iloc[-2] > df['support_line'].iloc[-2] and df['close'].iloc[-1] > df['open'].iloc[-1]:     
-                                    self.trendline_signal = "BUY"
-                            elif df['close'].iloc[-3] < df['resistance_line'].iloc[-3] and df['close'].iloc[-2] < df['resistance_line'].iloc[-2] and df['close'].iloc[-1] < df['open'].iloc[-1]:     
-                                    self.trendline_signal = "SELL"
+                            if self.settings.TRENDLINE_BREAKOUT:
+                                if df['close'].iloc[-2] > df['support_line'].iloc[-2] and df['open'].iloc[-1] > df['support_line'].iloc[-1] and df['close'].iloc[-1] > df['open'].iloc[-1]:     
+                                        self.trendline_signal = "BUY"
+                                elif df['close'].iloc[-2] < df['resistance_line'].iloc[-2] and df['open'].iloc[-1] < df['resistance_line'].iloc[-1] and df['close'].iloc[-1] < df['open'].iloc[-1]:     
+                                        self.trendline_signal = "SELL"
+                                else:
+                                    self.trendline_signal = "HOLD"
                             else:
-                                 self.trendline_signal = "HOLD"
+                                if df['high'].iloc[-3] >= df['support_line'].iloc[-3] and df['close'].iloc[-2] < df['support_line'].iloc[-2] and df['close'].iloc[-1] < df['open'].iloc[-1]:
+                                    self.trendline_signal = "SELL"
+                                elif df['low'].iloc[-3] <= df['resistance_line'].iloc[-3] and df['close'].iloc[-2] > df['resistance_line'].iloc[-2] and df['close'].iloc[-1] > df['open'].iloc[-1]:
+                                    self.trendline_signal = "BUY"
+                                else:
+                                    self.trendline_signal = "HOLD"
  
                 # Calculate the ADX
                 if self.settings.ADX_STUDY:
@@ -288,6 +317,7 @@ class Interval:
 
                     # Check for BUY signal
                     buy_conditions = (
+                        (self.settings.BOS_STUDY and self.bos_signal == "BUY") or
                         (self.settings.EMA_STUDY and self.settings.EMA_CHECK_ON_OPEN and self.ema_open_signal == "BUY") or
                         (self.settings.MACD_STUDY and self.settings.MACD_CHECK_ON_OPEN and self.macd_signal == "BUY") or
                         (self.settings.BBM_STUDY and self.settings.BBM_CHECK_ON_OPEN and self.bbm_signal == "BUY") or
@@ -301,6 +331,7 @@ class Interval:
 
                     # Check for SELL signal
                     sell_conditions = (
+                        (self.settings.BOS_STUDY and self.bos_signal == "SELL") or
                         (self.settings.EMA_STUDY and self.settings.EMA_CHECK_ON_OPEN and self.ema_open_signal == "SELL") or
                         (self.settings.MACD_STUDY and self.settings.MACD_CHECK_ON_OPEN and self.macd_signal == "SELL") or
                         (self.settings.BBM_STUDY and self.settings.BBM_CHECK_ON_OPEN and self.bbm_signal == "SELL") or
@@ -320,17 +351,34 @@ class Interval:
                     else:
                         self.current_signal = "HOLD"
                 else:
-                    # If EMA is enabled and crossing and MACD is enabled and crossing and BBM is enabled and crossing and RSI is enbabled and crossing
-                    # and 
-                    # ADX is enabled and strong and candle trend is enabled and bullish
-                    # then BUY or SELL
                     buy_conditions = (
-                        (not self.settings.EMA_STUDY or not self.settings.EMA_CHECK_ON_OPEN or self.ema_open_signal == "BUY") and
-                        (not self.settings.MACD_STUDY or not self.settings.MACD_CHECK_ON_OPEN or self.macd_signal == "BUY") and
-                        (not self.settings.BBM_STUDY or not self.settings.BBM_CHECK_ON_OPEN or self.bbm_signal == "BUY") and
-                        (not self.settings.RSI_STUDY or not self.settings.RSI_CHECK_ON_OPEN or self.rsi_signal == "BUY") and
-                        (not self.settings.TRENDLINE_STUDY or not self.settings.TRENDLINE_CHECK_ON_OPEN or self.trendline_signal == "BUY")
+                        (self.settings.BOS_STUDY and self.bos_signal == "BUY")
+                        or not self.settings.BOS_STUDY
+                    ) and (
+                        (self.settings.EMA_STUDY and self.settings.EMA_CHECK_ON_OPEN and self.ema_open_signal == "BUY")
+                        or not self.settings.EMA_STUDY or not self.settings.EMA_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.MACD_STUDY and self.settings.MACD_CHECK_ON_OPEN and self.macd_signal == "BUY")
+                        or not self.settings.MACD_STUDY or not self.settings.MACD_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.BBM_STUDY and self.settings.BBM_CHECK_ON_OPEN and self.bbm_signal == "BUY")
+                        or not self.settings.BBM_STUDY or not self.settings.BBM_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.RSI_STUDY and self.settings.RSI_CHECK_ON_OPEN and self.rsi_signal == "BUY")
+                        or not self.settings.RSI_STUDY or not self.settings.RSI_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.TRENDLINE_STUDY and self.settings.TRENDLINE_CHECK_ON_OPEN and self.trendline_signal == "BUY")
+                        or not self.settings.TRENDLINE_STUDY or not self.settings.TRENDLINE_CHECK_ON_OPEN
                     )
+                    if not any([
+                        self.settings.EMA_STUDY, self.settings.MACD_STUDY, self.settings.BBM_STUDY,
+                        self.settings.RSI_STUDY, self.settings.TRENDLINE_STUDY
+                    ]) and not any([
+                        self.settings.EMA_CHECK_ON_OPEN, self.settings.MACD_CHECK_ON_OPEN, self.settings.BBM_CHECK_ON_OPEN,
+                        self.settings.RSI_CHECK_ON_OPEN, self.settings.TRENDLINE_CHECK_ON_OPEN
+                    ]):
+                        buy_conditions = False
+
                     additional_buy_conditions = (
                         (not self.settings.ADX_STUDY or not self.settings.ADX_CHECK_ON_OPEN or self.adx_signal == "STRONG") and
                         (not self.settings.CANDLE_TREND_STUDY or not self.settings.CANDLE_TREND_CHECK_ON_OPEN or self.candle_trend == "BULLISH")
@@ -338,15 +386,36 @@ class Interval:
 
                     # Check for SELL signal
                     sell_conditions = (
-                        (not self.settings.EMA_STUDY or not self.settings.EMA_CHECK_ON_OPEN or self.ema_open_signal == "SELL") and
-                        (not self.settings.MACD_STUDY or not self.settings.MACD_CHECK_ON_OPEN or self.macd_signal == "SELL") and
-                        (not self.settings.BBM_STUDY or not self.settings.BBM_CHECK_ON_OPEN or self.bbm_signal == "SELL") and
-                        (not self.settings.RSI_STUDY or not self.settings.RSI_CHECK_ON_OPEN or self.rsi_signal == "SELL") and
-                        (not self.settings.TRENDLINE_STUDY or not self.settings.TRENDLINE_CHECK_ON_OPEN or self.trendline_signal == "SELL")
+                        (self.settings.BOS_STUDY and self.bos_signal == "SELL")
+                        or not self.settings.BOS_STUDY
+                    ) and (
+                        (self.settings.EMA_STUDY and self.settings.EMA_CHECK_ON_OPEN and self.ema_open_signal == "SELL")
+                        or not self.settings.EMA_STUDY or not self.settings.EMA_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.MACD_STUDY and self.settings.MACD_CHECK_ON_OPEN and self.macd_signal == "SELL")
+                        or not self.settings.MACD_STUDY or not self.settings.MACD_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.BBM_STUDY and self.settings.BBM_CHECK_ON_OPEN and self.bbm_signal == "SELL")
+                        or not self.settings.BBM_STUDY or not self.settings.BBM_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.RSI_STUDY and self.settings.RSI_CHECK_ON_OPEN and self.rsi_signal == "SELL")
+                        or not self.settings.RSI_STUDY or not self.settings.RSI_CHECK_ON_OPEN
+                    ) and (
+                        (self.settings.TRENDLINE_STUDY and self.settings.TRENDLINE_CHECK_ON_OPEN and self.trendline_signal == "SELL")
+                        or not self.settings.TRENDLINE_STUDY or not self.settings.TRENDLINE_CHECK_ON_OPEN
                     )
+                    if not any([
+                        self.settings.EMA_STUDY, self.settings.MACD_STUDY, self.settings.BBM_STUDY,
+                        self.settings.RSI_STUDY, self.settings.TRENDLINE_STUDY
+                    ]) and not any([
+                        self.settings.EMA_CHECK_ON_OPEN, self.settings.MACD_CHECK_ON_OPEN, self.settings.BBM_CHECK_ON_OPEN,
+                        self.settings.RSI_CHECK_ON_OPEN, self.settings.TRENDLINE_CHECK_ON_OPEN
+                    ]):
+                        sell_conditions = False
+
                     additional_sell_conditions = (
-                        (not self.settings.ADX_STUDY or not self.settings.ADX_CHECK_ON_OPEN or self.adx_signal == "STRONG") and
-                        (not self.settings.CANDLE_TREND_STUDY or not self.settings.CANDLE_TREND_CHECK_ON_OPEN or self.candle_trend == "BEARISH")
+                        (self.settings.ADX_STUDY and self.settings.ADX_CHECK_ON_OPEN and self.adx_signal == "STRONG") or
+                        (self.settings.CANDLE_TREND_STUDY and self.settings.CANDLE_TREND_CHECK_ON_OPEN or self.candle_trend == "BEARISH")
                     )
 
                     # Determine current signal
@@ -623,6 +692,7 @@ class Tickers:
                         if not interval._data is None and len(interval._data) >= self.settings.BARS:
                             args[0].get_interval_ticks(intervalId)._data = interval._data
                             args[0].get_interval_ticks(intervalId).current_signal = interval.current_signal                        
+                            args[0].get_interval_ticks(intervalId).bos_signal = interval.bos_signal
                             args[0].get_interval_ticks(intervalId).ema_open_signal = interval.ema_open_signal
                             args[0].get_interval_ticks(intervalId).ema_close_signal = interval.ema_close_signal
                             args[0].get_interval_ticks(intervalId).macd_signal = interval.macd_signal
@@ -660,6 +730,8 @@ class Tickers:
                             f"{period}_trend": intervalObj.current_signal,
                             f"{period}_cb": intervalObj.signal_strength,
                             f"{period}_barcolor": lastcandle['barcolor'],
+                            f"{period}_bos": intervalObj.bos_signal,
+                            f"{period}_ema_open": intervalObj.ema_open_signal,
                             f"{period}_ema_open": intervalObj.ema_open_signal,
                             f"{period}_ema_close": intervalObj.ema_close_signal,
                             f"{period}_macd":intervalObj.macd_signal,
@@ -687,6 +759,7 @@ class Tickers:
                     'lastcolor': "", 'bidcolor': "", 'askcolor': "", 'bid': 0.0, 'ask': 0.0, 'last': 0.0,
                     f"{period}_cb":0, f"{period}_barcolor": "", f"{period}_trend": "",
                     f"{period}_open": 0.0, f"{period}_close": 0.0, f"{period}_high": 0.0, f"{period}_low": 0.0,
+                    f"{period}_bos": "", 
                     f"{period}_ema": "", f"{period}_macd": "", f"{period}_bbm": "", f"{period}_rsi": "", f"{period}_trendline": "", f"{period}_candle_trend": "", f"{period}_adx": ""
                 }
                 df.fillna(fill_values, inplace=True)

{bitunix_automated_crypto_trading-3.1.5 → bitunix_automated_crypto_trading-3.1.7}/bitunix_automated_crypto_trading/config.py

@@ -6,11 +6,14 @@ import sqlite3
 class Settings(BaseSettings):
     # Start autotrading on start
     AUTOTRADE: bool = Field(default=False)
+    
+    #Ticker list
+    TICKERS:str = Field(default="")
+    THRESHOLD: float = Field(default=5.0, ge=0.0)
+    MIN_VOLUME: int = Field(default=10_000_000, ge=0)
 
     # Trading Parameters
     LEVERAGE: int = Field(default=20, ge=1, le=100)
-    THRESHOLD: float = Field(default=5.0, ge=0.0)
-    MIN_VOLUME: int = Field(default=10_000_000, ge=0)
     ORDER_AMOUNT_PERCENTAGE: float = Field(default=0.01, ge=0.0, le=100)
     MAX_AUTO_TRADES: int = Field(default=10, ge=0)
     PROFIT_AMOUNT: float = Field(default=0.25, ge=0.0)
@@ -19,6 +22,7 @@ class Settings(BaseSettings):
     BARS: int = Field(default=100, ge=1)
 
     # Technical Indicators Parameters
+    BOS_PERIOD: int = Field(default=20, ge=1)
     MA_FAST: int = Field(default=10, ge=1)
     MA_MEDIUM: int = Field(default=20, ge=1)
     MA_SLOW: int = Field(default=50, ge=1)
@@ -34,6 +38,7 @@ class Settings(BaseSettings):
     # Technical Indicators
     OPEN_ON_ANY_SIGNAL: bool = Field(default=True)
 
+    BOS_STUDY: bool = Field(default=True)
     EMA_CHART: bool = Field(default=True)
     EMA_STUDY: bool = Field(default=True)
     EMA_CROSSING: bool = Field(default=False)
@@ -59,10 +64,10 @@ class Settings(BaseSettings):
     RSI_CHECK_ON_OPEN: bool = Field(default=False)
     RSI_CHECK_ON_CLOSE: bool = Field(default=False)
 
+    TRENDLINE_PEAK_DISTANCE: int = Field(default=1, ge=0, le=30)
     TRENDLINE_CHART: bool = Field(default=True)
     TRENDLINE_STUDY: bool = Field(default=True)
-    TRENDLINE_PEAK_DISTANCE: int = Field(default=1, ge=0, le=30)
-    TRENDLINE_LOOKBACK: int = Field(default=20, ge=10, le=200)
+    TRENDLINE_BREAKOUT: bool = Field(default=False)
     TRENDLINE_CHECK_ON_OPEN: bool = Field(default=False)
     TRENDLINE_CHECK_ON_CLOSE: bool = Field(default=False)
 
@@ -72,7 +77,7 @@ class Settings(BaseSettings):
 
     CANDLE_TREND_STUDY: bool = Field(default=True)
     CANDLE_TREND_CHECK_ON_OPEN: bool = Field(default=False)
-    CANDLE_TREND_CHECK_ON_CLOSE: bool = Field(default=False)
+    CANDLE_TREND_REVERSAL_CHECK_ON_CLOSE: bool = Field(default=False)
 
     # Time Intervals
     SCREEN_REFRESH_INTERVAL: int = Field(default=1, ge=1)
@@ -101,6 +106,7 @@ class Settings(BaseSettings):
         # Specify the file name for loading environment variables
         env_file = os.path.dirname(os.path.abspath(__file__))+"/config.txt"
 
+   
     @classmethod
     def load_from_db(cls, db_path: str, table_name: str = "settings"):
         # Connect to SQLite database

{bitunix_automated_crypto_trading-3.1.5 → bitunix_automated_crypto_trading-3.1.7}/bitunix_automated_crypto_trading.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitunix_automated_crypto_trading
-Version: 3.1.5
+Version: 3.1.7
 Summary: Bitunix Futures Auto Trading Platform
 Home-page: https://github.com/tcj2001/bitunix-automated-crypto-trading
 Author: tcj2001

{bitunix_automated_crypto_trading-3.1.5 → bitunix_automated_crypto_trading-3.1.7}/setup.py

@@ -66,7 +66,7 @@ class CustomInstall(install):
 
 setup(
     name="bitunix_automated_crypto_trading",
-    version="3.1.5",
+    version="3.1.7",
     license="MIT",
     author="tcj2001",
     author_email="thomsonmathews@hotmail.com",