bitunix-automated-crypto-trading 3.0.1__tar.gz → 3.0.4__tar.gz

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/PKG-INFO

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

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/README.md

@@ -73,9 +73,10 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
     
   - `Study Parameters`:
     - `EMA_STUDY`: Enable EMA study
-    - `EMA_CROSSING`: Check EMA crossing or crossed, COMPARING FAST AND MEDIUM MOVING AVERAGE 
+    - `EMA_CROSSING`: Check EMA crossing or crossed, COMPARING MEDIUM AND SLOW MOVING AVERAGE 
     - `EMA_CHECK_ON_OPEN`: Check EMA on open
     - `EMA_CHECK_ON_CLOSE`: Check EMA on close
+    - `EMA_CLOSE_ON_FAST_MEDIUM`: Check EMA close comparing fast and medium
 
     - `MACD_STUDY`: Enable MACD study
     - `MACD_CROSSING`: Check MACD crossing or crossed, comparing MACD line and signal line
@@ -156,37 +157,7 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
   - AutoTradeProcess function inside BitunixSignal.py, you can setup your opening and closing trading strategy
   - User interface will list the stocks in the signal window with BUY or SELL signal based on the descending value of signal_strength
   - All study can be controlled thru environment variables
-  - Auto trade process open the trade based on following conditions:
-    - If the current candle is bullish 
-      and moving average is above the medium moving average
-      and MACD_line > Signal_line
-      and RSI is above the long RSI
-      and current close is above bollinger band middle line
-      and ADX is above 25 (STRONG)
-      it will open long position
-    - If the current candle is bearish
-      and moving average is below the medium moving average
-      and MACD_line < Signal_line
-      and RSI is below the long RSI
-      and current close is belowe bollinger band middle line
-      and ADX is above 25 (STRONG)
-      it will open short position
-  - Auto trade process closes the trade based on following conditions:
-    - If the current candle is bearish, it will close the trade
-    - If the trade is in profit and greater than the profit_amount , it will close the trade
-    - If the trade is in profit and greater than the profit_amount , it will close the trade
-    - If the trade is in loss and greater than the loss_amount , it will close the trade
-    - If the order is open for more than 1 minute, it will close the open orders
-    - It will close long or short postions:
-      - If the trade is long and the fast moving average is above the medium moving average, it will close the trade
-      - If the trade is short and the fast moving average is below the medium moving average, it will close the trade
-      - If the trade is long and the MACD_line < Signal_line, it will close the trade
-      - If the trade is short and the MACD_line > Signal_line, it will close the trade
-      - If the trade is long and the short RSI < long RSI, it will close the trade
-      - If the trade is short and the short RSI > long RSI, it will close the trade
-      - if the trade is long and current close is less bollinger band middle line , it will close the trade
-      - if the trade is short and the current close is above bollinger band middle line , it will close the trade
-      - if the trade is long or short and the ADX is below 25 (WEAK), it will close the trade
+  - Auto trade process for opening the trade and closing the trade is configurable using the config file
 
 
 ## Installation

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/bitunix_automated_crypto_trading/BitunixApi.py

@@ -91,7 +91,7 @@ class BitunixApi:
             "nonce": nonce,           
         }
         
-        query_string = urlencode(sorted(params.items())).replace('=','') if params else ""
+        query_string = urlencode(sorted(params.items())).replace('=','').replace('&','')  if params else ""
         signature = await self.sign_request(nonce, timestamp, query_params=query_string)
         headers["sign"] = signature  
 

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/bitunix_automated_crypto_trading/BitunixSignal.py

@@ -496,8 +496,9 @@ class BitunixSignal:
         try:
             self.positionHistoryData = await self.bitunixApi.GetPositionHistoryData()
             if self.positionHistoryData and 'positionList' in self.positionHistoryData:
-                self.positionHistorydf = pd.DataFrame(self.positionHistoryData['positionList'], columns=["symbol", "side","realizedPNL", "ctime", "maxQty", "closePrice","fee", "funding"])
+                self.positionHistorydf = pd.DataFrame(self.positionHistoryData['positionList'], columns=["symbol", "side","realizedPNL", "ctime", "mtime","maxQty", "closePrice","fee", "funding"])
                 self.positionHistorydf['ctime'] = pd.to_datetime(self.positionHistorydf['ctime'].astype(float), unit='ms').dt.tz_localize('UTC').dt.tz_convert(cst).dt.strftime('%Y-%m-%d %H:%M:%S')
+                self.positionHistorydf['mtime'] = pd.to_datetime(self.positionHistorydf['mtime'].astype(float), unit='ms').dt.tz_localize('UTC').dt.tz_convert(cst).dt.strftime('%Y-%m-%d %H:%M:%S')
                 self.positionHistorydf['charts'] = self.positionHistorydf.apply(self.add_charts_button, axis=1)
                 self.positionHistorydf['bitunix'] = self.positionHistorydf.apply(self.add_bitunix_button, axis=1)
 
@@ -560,12 +561,12 @@ 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", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", 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}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", 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", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", 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}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", 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}_ema", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", f"{period}_adx", f"{period}_candle_trend",
+                                f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi", 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)
             else:
@@ -579,7 +580,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}_ema", f"{period}_macd", f"{period}_bbm", f"{period}_rsi",f"{period}_adx",f"{period}_candle_trend",
+                        f"{period}_ema_open", f"{period}_ema_close", f"{period}_macd", f"{period}_bbm", f"{period}_rsi",f"{period}_adx",f"{period}_candle_trend",
                         'lastcolor', 'bidcolor', 'askcolor', 'bid', 'ask', 'last',
                         f"{period}_open", f"{period}_close", f"{period}_high", f"{period}_low", 
                     ]].sort_values(by=[f'{period}_cb'], ascending=[False])
@@ -690,7 +691,7 @@ class BitunixSignal:
                     total_pnl = unrealized_pnl + realized_pnl
                     side=row['side']
 
-                    requiredCols=[f'{period}_open', f'{period}_close', f'{period}_high', f'{period}_low', f'{period}_ema', f'{period}_macd', f'{period}_bbm', f'{period}_rsi', f'{period}_candle_trend', f'{period}_trend', f'{period}_cb', f'{period}_barcolor']    
+                    requiredCols=[f'{period}_open', f'{period}_close', f'{period}_high', f'{period}_low', f'{period}_ema_open', f"{period}_ema_close", f'{period}_macd', f'{period}_bbm', f'{period}_rsi', f'{period}_candle_trend', f'{period}_trend', f'{period}_cb', f'{period}_barcolor']    
                     required_cols = set(requiredCols)
 
                     # Close position that fall the below criteria
@@ -739,9 +740,9 @@ class BitunixSignal:
                                 )
                                 continue
 
-                            # Moving average comparison between fast and medium
+                            # Moving average comparison between fast and medium or medium and slow
                             if self.settings.EMA_STUDY and self.settings.EMA_CHECK_ON_CLOSE: 
-                                if row.side == 'BUY' and self.signaldf_full.at[row.symbol, f'{period}_ema'] == "SELL":
+                                if row.side == 'BUY' and self.signaldf_full.at[row.symbol, f'{period}_ema_close'] == "SELL":
                                     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
 
@@ -758,7 +759,7 @@ class BitunixSignal:
                                     )
                                     continue
 
-                                if row.side == 'SELL' and self.signaldf_full.at[row.symbol, f'{period}_ema'] == "BUY":
+                                if row.side == 'SELL' and self.signaldf_full.at[row.symbol, f'{period}_ema_close'] == "BUY":
                                     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
                                     self.notifications.add_notification(
@@ -1027,7 +1028,10 @@ class BitunixSignal:
                 side = data['side']
                 positionId = data['positionId']
                 event = data['event']
-                entryValue = float(data['entryValue'])
+                if 'entryValue' in data:
+                    entryValue = float(data['entryValue'])
+                else:
+                    entryValue = 0
                 price = entryValue / qty if entryValue != 0 and qty != 0 else 0
 
                 if event == "OPEN":

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/bitunix_automated_crypto_trading/TickerManager.py

@@ -19,7 +19,8 @@ class Interval:
         
         #these signals are used to list stocks in the signals sections on the main page
         self.current_signal="HOLD"
-        self.ema_signal="HOLD"
+        self.ema_open_signal="HOLD"
+        self.ema_close_signal="HOLD"
         self.macd_signal="HOLD"
         self.bbm_signal="HOLD"
         self.rsi_signal="HOLD"
@@ -54,34 +55,55 @@ class Interval:
                     df['ma_fast'] = talib.EMA(df['close'], timeperiod=self.settings.MA_FAST)
                     df['ma_fast'] = df['ma_fast'].bfill()
                     df.fillna({'ma_fast':0}, inplace=True)
+                    df['ma_fast_slope'] = df['ma_fast'].diff()
+                    df['ma_fast_angle'] = np.degrees(np.arctan(df['ma_fast_slope']))    
+                    df.fillna({'ma_fast_slope':0}, inplace=True)
+                    df.fillna({'ma_fast_angle':0}, inplace=True)  
 
-                    df['ma_slow'] = talib.EMA(df['close'], timeperiod=self.settings.MA_SLOW)
-                    df['ma_slow'] = df['ma_slow'].bfill()
-                    df.fillna({'ma_slow':0}, inplace=True)
-                
                     df['ma_medium'] = talib.EMA(df['close'], timeperiod=self.settings.MA_MEDIUM)
                     df['ma_medium'] = df['ma_medium'].bfill()
                     df.fillna({'ma_medium':0}, inplace=True)
-
-                    df['ma_slope'] = df['ma_medium'].diff()
-                    df['ma_angle'] = np.degrees(np.arctan(df['ma_slope']))    
-                    df.fillna({'ma_slope':0}, inplace=True)
-                    df.fillna({'ma_angle':0}, inplace=True)  
+                    df['ma_medium_slope'] = df['ma_medium'].diff()
+                    df['ma_medium_angle'] = np.degrees(np.arctan(df['ma_medium_slope']))    
+                    df.fillna({'ma_medium_slope':0}, inplace=True)
+                    df.fillna({'ma_medium_angle':0}, inplace=True)  
                                                       
+                    df['ma_slow'] = talib.EMA(df['close'], timeperiod=self.settings.MA_SLOW)
+                    df['ma_slow'] = df['ma_slow'].bfill()
+                    df.fillna({'ma_slow':0}, inplace=True)
+                    df['ma_slow_slope'] = df['ma_slow'].diff()
+                    df['ma_slow_angle'] = np.degrees(np.arctan(df['ma_slow_slope']))    
+                    df.fillna({'ma_slow_slope':0}, inplace=True)
+                    df.fillna({'ma_slow_angle':0}, inplace=True)  
+                
                     if self.settings.EMA_CROSSING:
-                        if df['ma_fast'].iloc[-2] <= df['ma_medium'].iloc[-2] and df['ma_fast'].iloc[-1] > df['ma_medium'].iloc[-1]:
-                            self.ema_signal = "BUY"
-                        elif df['ma_fast'].iloc[-2] >= df['ma_medium'].iloc[-2] and df['ma_fast'].iloc[-1] <= df['ma_medium'].iloc[-1]:
-                            self.ema_signal = "SELL"
+                        if df['ma_medium'].iloc[-2] <= df['ma_slow'].iloc[-2] and df['ma_medium'].iloc[-1] > df['ma_slow'].iloc[-1]:
+                            self.ema_open_signal = "BUY"
+                            self.ema_close_signal = "BUY"
+                        elif df['ma_medium'].iloc[-2] >= df['ma_slow'].iloc[-2] and df['ma_medium'].iloc[-1] < df['ma_slow'].iloc[-1]:
+                            self.ema_open_signal = "SELL"
+                            self.ema_close_signal = "SELL"
                         else:
-                            self.ema_signal = "HOLD"
+                            self.ema_open_signal = "HOLD"
+                            self.ema_close_signal = "HOLD"
+
+                        if self.settings.EMA_CLOSE_ON_FAST_MEDIUM:
+                            if df['ma_fast'].iloc[-2] <= df['ma_medium'].iloc[-2] and df['ma_fast'].iloc[-1] > df['ma_medium'].iloc[-1]:
+                                self.ema_close_signal = "BUY"
+                            elif df['ma_fast'].iloc[-2] >= df['ma_medium'].iloc[-2] and df['ma_fast'].iloc[-1] < df['ma_medium'].iloc[-1]:
+                                self.ema_close_signal = "SELL"
+                            else:
+                                self.ema_close_signal = "HOLD"
                     else:
-                        if df['close'].iloc[-1] > df['ma_fast'].iloc[-1] and df['ma_fast'].iloc[-1] > df['ma_medium'].iloc[-1]:
-                            self.ema_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_signal = "SELL"
+                        if df['close'].iloc[-1] > df['ma_medium'].iloc[-1] and df['ma_medium'].iloc[-1] > df['ma_slow'].iloc[-1]:
+                            self.ema_open_signal = "BUY"
+                            self.ema_close_signal = "BUY"
+                        elif df['close'].iloc[-1] < df['ma_medium'].iloc[-1] and df['ma_medium'].iloc[-1] < df['ma_slow'].iloc[-1]:
+                            self.ema_open_signal = "SELL"
+                            self.ema_close_signal = "SELL"
                         else:
-                            self.ema_signal = "HOLD"
+                            self.ema_open_signal = "HOLD"
+                            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')
@@ -96,10 +118,10 @@ class Interval:
                     df.fillna({'MACD_Signal':0}, inplace=True)
                     df.fillna({'MACD_Histogram':0}, inplace=True)
                             
-                    df['MACD_slope'] = df['MACD_Signal'].diff()
-                    df['MACD_angle'] = np.degrees(np.arctan(df['MACD_slope']))                                        
-                    df.fillna({'MACD_slope':0}, inplace=True)
-                    df.fillna({'MACD_angle':0}, inplace=True)                                    
+                    df['MACD_Line_slope'] = df['MACD_Line'].diff()
+                    df['MACD_Line_angle'] = np.degrees(np.arctan(df['MACD_Line_slope']))                                        
+                    df.fillna({'MACD_Line_slope':0}, inplace=True)
+                    df.fillna({'MACD_Line_angle':0}, inplace=True)                                    
                         
                     if self.settings.MACD_CROSSING:
                         if df['MACD_Line'].iloc[-2] <= df['MACD_Signal'].iloc[-2] and df['MACD_Line'].iloc[-1] > df['MACD_Signal'].iloc[-1]: 
@@ -156,14 +178,18 @@ class Interval:
                 if self.settings.RSI_STUDY:
                     df['rsi_fast'] = talib.RSI(df['close'],timeperiod=self.settings.RSI_FAST)
                     df.fillna({'rsi_fast':0}, inplace=True)
+                    df['rsi_fast_slope'] = df['rsi_fast'].diff()
+                    df['rsi_fast_angle'] = np.degrees(np.arctan(df['rsi_fast_slope']))                                        
+                    df.fillna({'rsi_fast_slope':0}, inplace=True)
+                    df.fillna({'rsi_fast_angle':0}, inplace=True)                                    
                     
                     df['rsi_slow'] = talib.RSI(df['close'],timeperiod=self.settings.RSI_SLOW)
                     df.fillna({'rsi_slow':0}, inplace=True)
+                    df['rsi_slow_slope'] = df['rsi_slow'].diff()
+                    df['rsi_slow_angle'] = np.degrees(np.arctan(df['rsi_slow_slope']))                                        
+                    df.fillna({'rsi_slow_slope':0}, inplace=True)
+                    df.fillna({'rsi_slow_angle':0}, inplace=True)                                    
                 
-                    df['rsi_slope'] = df['rsi_fast'].diff()
-                    df['rsi_angle'] = np.degrees(np.arctan(df['rsi_slope']))                                        
-                    df.fillna({'rsi_slope':0}, inplace=True)
-                    df.fillna({'rsi_angle':0}, inplace=True)                                    
 
                     if self.settings.RSI_CROSSING:
                         if df['rsi_fast'].iloc[-2] <= df['rsi_slow'].iloc[-2] and df['rsi_fast'].iloc[-1] > df['rsi_slow'].iloc[-1]:
@@ -225,7 +251,7 @@ class Interval:
 
                     # Check for BUY signal
                     buy_conditions = (
-                        (self.settings.EMA_STUDY and self.settings.EMA_CHECK_ON_OPEN and self.ema_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
                         (self.settings.RSI_STUDY and self.settings.RSI_CHECK_ON_OPEN and self.rsi_signal == "BUY")
@@ -237,7 +263,7 @@ class Interval:
 
                     # Check for SELL signal
                     sell_conditions = (
-                        (self.settings.EMA_STUDY and self.settings.EMA_CHECK_ON_OPEN and self.ema_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
                         (self.settings.RSI_STUDY and self.settings.RSI_CHECK_ON_OPEN and self.rsi_signal == "SELL")
@@ -260,7 +286,7 @@ class Interval:
                     # 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_signal == "BUY") and
+                        (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")
@@ -272,7 +298,7 @@ class Interval:
 
                     # Check for SELL signal
                     sell_conditions = (
-                        (not self.settings.EMA_STUDY or not self.settings.EMA_CHECK_ON_OPEN or self.ema_signal == "SELL") and
+                        (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")
@@ -548,7 +574,8 @@ class Tickers:
                     if not interval._data is None:
                         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).ema_signal = interval.ema_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
                         args[0].get_interval_ticks(intervalId).bbm_signal = interval.bbm_signal                        
                         args[0].get_interval_ticks(intervalId).rsi_signal = interval.rsi_signal
@@ -584,7 +611,8 @@ class Tickers:
                                 f"{period}_trend": intervalObj.current_signal,
                                 f"{period}_cb": intervalObj.signal_strength,
                                 f"{period}_barcolor": lastcandle['barcolor'],
-                                f"{period}_ema": intervalObj.ema_signal,
+                                f"{period}_ema_open": intervalObj.ema_open_signal,
+                                f"{period}_ema_close": intervalObj.ema_close_signal,
                                 f"{period}_macd":intervalObj.macd_signal,
                                 f"{period}_bbm":intervalObj.bbm_signal,
                                 f"{period}_rsi":intervalObj.rsi_signal,

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/bitunix_automated_crypto_trading/config.py

@@ -18,8 +18,8 @@ class Settings(BaseSettings):
     BARS: int = Field(default=100, ge=1)
 
     # Technical Indicators Parameters
-    MA_FAST: int = Field(default=12, ge=1)
-    MA_MEDIUM: int = Field(default=26, 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)
     RSI_FAST: int = Field(default=6, ge=1)
     RSI_SLOW: int = Field(default=24, ge=1)
@@ -38,6 +38,7 @@ class Settings(BaseSettings):
     EMA_CROSSING: bool = Field(default=False)
     EMA_CHECK_ON_OPEN: bool = Field(default=True)
     EMA_CHECK_ON_CLOSE: bool = Field(default=True)
+    EMA_CLOSE_ON_FAST_MEDIUM: bool = Field(default=True)
 
     MACD_CHART: bool = Field(default=False)
     MACD_STUDY: bool = Field(default=True)

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/bitunix_automated_crypto_trading.egg-info/PKG-INFO

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

{bitunix_automated_crypto_trading-3.0.1 → bitunix_automated_crypto_trading-3.0.4}/setup.py

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