bitunix-automated-crypto-trading 3.3.6__py3-none-any.whl → 3.3.7__py3-none-any.whl

bitunix_automated_crypto_trading/BitunixSignal.py

@@ -650,14 +650,14 @@ class BitunixSignal:
         trade_time = datetime.strptime(datetime_str, "%Y-%m-%d %H:%M:%S")
         # Convert datetime object to Unix timestamp)
         trade_time_unix = int(trade_time.timestamp())
-        print(f"trade_time_unix: {trade_time_unix}, trade_time: {trade_time}")
+        #print(f"trade_time_unix: {trade_time_unix}, trade_time: {trade_time}")
         # Get current Unix timestamp
         current_time_unix = int(time.time())
-        print(f"current_time_unix: {current_time_unix}, time: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
+        #print(f"current_time_unix: {current_time_unix}, time: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
         # Calculate duration in minutes
         duration_minutes = (current_time_unix - trade_time_unix) / 60
-        print(f"diff: {current_time_unix - trade_time_unix}")
-        print(f"duration_minutes: {duration_minutes}")
+        #print(f"diff: {current_time_unix - trade_time_unix}")
+        #print(f"duration_minutes: {duration_minutes}")
         
         return round(duration_minutes)
 
@@ -729,6 +729,7 @@ class BitunixSignal:
                         self.logger.info(f"row.symbol: {row.symbol} , duration_minutes: {duration_minutes}, last trade time: {mtime if duration_minutes is not None else 'N/A'}")
                         if duration_minutes is None or duration_minutes > self.settings.DELAY_IN_MINUTES_FOR_SAME_TICKER_TRADES:
                             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 ""
+                            #self.logger.info(f"row.symbol: {row.symbol} , ok to {side}, {row[f'{period}_barcolor']} , {row[f'{period}_trend']} ")
                             if side != "":
                                 select = True
                                 self.pendingPositions = await self.bitunixApi.GetPendingPositionData({'symbol': row.symbol})
@@ -792,6 +793,7 @@ class BitunixSignal:
                                     count=count+1
                         else:
                             self.logger.info(f"Skipping {row.symbol} as it has been opened for less than {self.settings.DELAY_IN_MINUTES_FOR_SAME_TICKER_TRADES} minutes")
+                            
                         if count >= int(self.settings.MAX_AUTO_TRADES):
                             break
                         await asyncio.sleep(0)
@@ -898,17 +900,22 @@ class BitunixSignal:
                                             
                                 if self.settings.BOT_TRAIL_SL:
                                     if old_slPrice is not None:
-                                        sl_midpoint =  old_slPrice / (1 - self.settings.LOSS_PERCENTAGE/100/self.settings.LEVERAGE) if side == "BUY" else old_slPrice / (1 + self.settings.LOSS_PERCENTAGE/100/self.settings.LEVERAGE) if tpPrice is not None else None
+                                       sl_midpoint =  old_slPrice / (1 - self.settings.LOSS_PERCENTAGE/100/self.settings.LEVERAGE) if side == "BUY" else old_slPrice / (1 + self.settings.LOSS_PERCENTAGE/100/self.settings.LEVERAGE) if tpPrice is not None else None
+                                       if roi > self.settings.PROFIT_PERCENTAGE:
+                                           sl_midpoint = tp_midpoint                                       
+                                       
                                     if sl_midpoint is not None and (price > sl_midpoint and side == "BUY" or price < sl_midpoint and side == "SELL"):
-
-                                        slPrice = price * (1 - float(self.settings.LOSS_PERCENTAGE) / 100 / self.settings.LEVERAGE) if side == "BUY" else price * (1 + float(self.settings.LOSS_PERCENTAGE) / 100 / self.settings.LEVERAGE)
+                                        if roi > self.settings.PROFIT_PERCENTAGE and self.settings.PROFIT_PERCENTAGE < self.settings.LOSS_PERCENTAGE:
+                                            slPrice = price * (1 - float(self.settings.PROFIT_PERCENTAGE) / 100 / self.settings.LEVERAGE) if side == "BUY" else price * (1 + float(self.settings.PROFIT_PERCENTAGE) / 100 / self.settings.LEVERAGE)
+                                        else:
+                                            slPrice = price * (1 - float(self.settings.LOSS_PERCENTAGE) / 100 / self.settings.LEVERAGE) if side == "BUY" else price * (1 + float(self.settings.LOSS_PERCENTAGE) / 100 / self.settings.LEVERAGE)
                                         slPrice = Decimal(await self.str_precision(slPrice))
                                         slPrice = float(str(slPrice.quantize(Decimal(f'1e-{decimal_places}'))))
                                         slOrderPrice = await self.increment_by_last_decimal(await self.str_precision(slPrice))
 
                                 if (self.settings.BOT_TRAIL_TP and tpOrderPrice is not None) or (self.settings.BOT_TRAIL_SL and slOrderPrice is not None):
                                     self.notifications.add_notification(
-                                        f'{colors.CYAN} {row.symbol} price: {price}, ROI: {roi}%, TP: {old_tpPrice}, TP midpoint: {tp_midpoint}, new TP: {tpPrice}, SL: {old_slPrice}, SL midpoint: {sl_midpoint}, new SL: {slPrice}'
+                                        f'{colors.CYAN} {row.symbol} avgOpenPrice: {avgOpenPrice}, current price: {price}, ROI: {roi}%, TP: {old_tpPrice}, TP midpoint: {tp_midpoint}, new TP: {tpPrice}, SL: {old_slPrice}, SL midpoint: {sl_midpoint}, new SL: {slPrice}'
                                     )
 
 
@@ -922,9 +929,14 @@ class BitunixSignal:
                                 if self.settings.BOT_TRAIL_SL and slPrice is not None and slOrderPrice is not None:
                                         datajs3 = await self.bitunixApi.ModifyTpSlOrder({'orderId':slorderId,'slPrice':str(slPrice),'slQty':str(qty),'slStopType':slStopType,'slOrderType':slOrderType})
                                         if datajs3 is not None:
-                                            self.notifications.add_notification(
-                                                f'{colors.CYAN} Stop Loss order for {row.symbol} moved from {old_slPrice} to {slPrice}'
-                                            )
+                                            if roi > self.settings.PROFIT_PERCENTAGE and self.settings.PROFIT_PERCENTAGE < self.settings.LOSS_PERCENTAGE:
+                                                self.notifications.add_notification(
+                                                    f'{colors.CYAN} Stop Loss order for {row.symbol} moved from {old_slPrice} to breakeven {slPrice}'
+                                                )
+                                            else:
+                                                self.notifications.add_notification(
+                                                    f'{colors.CYAN} Stop Loss order for {row.symbol} moved from {old_slPrice} to {slPrice}'
+                                                )
 
                                                                           
 

bitunix_automated_crypto_trading/TickerManager.py

@@ -750,13 +750,13 @@ class Tickers:
                 trending_conditions = [
                     (
                         (df[f'{period}_trend']=='BUY') &
-                        (df[f'{period}_cb']>1) 
+                        (df[f'{period}_cb']>= self.settings.MINIMUM_CONSECUTIVE_CANDLES) 
                         #&
                         #(df[f'{period}_barcolor']==self.green) 
                     ),
                     (
                         (df[f'{period}_trend']=='SELL') &
-                        (df[f'{period}_cb']>1) 
+                        (df[f'{period}_cb']>= self.settings.MINIMUM_CONSECUTIVE_CANDLES) 
                         #&
                         #(df[f'{period}_barcolor']==self.red) 
                     )

bitunix_automated_crypto_trading/config.py

@@ -44,6 +44,7 @@ class Settings(BaseSettings):
     MACD_SHORT: int = Field(default=12, ge=1)
     MACD_LONG: int = Field(default=26, ge=1)
     ADX_PERIOD: int = Field(default=14, ge=1)
+    MINIMUM_CONSECUTIVE_CANDLES: int = Field(default=2, ge=1)
 
     # Technical Indicators
     OPEN_ON_ANY_SIGNAL: bool = Field(default=True)

bitunix_automated_crypto_trading/version.py

@@ -1 +1 @@
-__version__ = "3.3.6"
+__version__ = "3.3.7"

{bitunix_automated_crypto_trading-3.3.6.dist-info → bitunix_automated_crypto_trading-3.3.7.dist-info}/METADATA

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

{bitunix_automated_crypto_trading-3.3.6.dist-info → bitunix_automated_crypto_trading-3.3.7.dist-info}/RECORD

@@ -1,19 +1,19 @@
 bitunix_automated_crypto_trading/AsyncThreadRunner.py,sha256=bNIM_1xRYQOFEsIn74EX6qVpC59-GMhhr2CeiPr_GWg,3253
 bitunix_automated_crypto_trading/BitunixApi.py,sha256=5qg-K5IcsAbb6K1feP9zL7RzSz7JzdGAxoY8R_YWxWE,15666
-bitunix_automated_crypto_trading/BitunixSignal.py,sha256=bZjkTPT74iwWglfgAuHiJUppX1Xu_jPLFIaup1sxDAo,89701
+bitunix_automated_crypto_trading/BitunixSignal.py,sha256=jPxnlaKA7NJDl1az3m1bfNLpouUsMYa35CixwUCD25E,91091
 bitunix_automated_crypto_trading/BitunixWebSocket.py,sha256=uiqAcis3u-ct07tjaTiC87ujzvcAtVRZ31CMiTBDW_M,11309
 bitunix_automated_crypto_trading/DataFrameHtmlRenderer.py,sha256=Pqdzhh_nfIxFEZH9L_R5QXB8moDPbgeTGT_hmBkHWMg,2899
 bitunix_automated_crypto_trading/NotificationManager.py,sha256=exs6REABBA1omTeTGuUuECzxs5dGqdyL7oI8WyxS6Xc,798
 bitunix_automated_crypto_trading/SupportResistance.py,sha256=x_to4M4OHg0h8o40DXDBa4E_5io-y2Lb5qo2VzFnu_8,5765
 bitunix_automated_crypto_trading/ThreadManager.py,sha256=Lw5_1EIT0m3AFSv5CIMpnjtA0DnNw2qQ6JtSpT34LyM,2349
-bitunix_automated_crypto_trading/TickerManager.py,sha256=CLd7pvE-qyYBPBauy--A54z7srmMMJsiaWcrY4ezFFU,41939
+bitunix_automated_crypto_trading/TickerManager.py,sha256=tYzO7-vxb-60a-yvsRDC4w9GNdTsqWwy8DxbagtsqAc,42023
 bitunix_automated_crypto_trading/__init__.py,sha256=1hzk6nX8NnUCr1tsq8oFq1qGCNhNwnwldWE75641Eew,78
 bitunix_automated_crypto_trading/bitunix.py,sha256=lxwnYARxldA2oU6GdjupilXIlnUh4RX8rQLCOn7x13I,27143
-bitunix_automated_crypto_trading/config.py,sha256=-gP54OFwQkSfJFCGvFW7kJ7z4n6fsLfG493cwcdp42g,5881
+bitunix_automated_crypto_trading/config.py,sha256=2K-5NzWoVUaU3O2tgi4qt-3dA_sCC6Nm3vFQBZrO5y8,5943
 bitunix_automated_crypto_trading/logger.py,sha256=NHnA5JZdUFkTAhB7i-1iCAwrdf1fxhDuRvJUkbKPi9Y,2923
-bitunix_automated_crypto_trading/version.py,sha256=QlDzkQK9qeebPm7w86m1PXgNyblEjljJHbkYgYpwrx4,21
-bitunix_automated_crypto_trading-3.3.6.dist-info/METADATA,sha256=kVSH1fSEHWwEVPWarKVC5FpXcTVjrv6I4m9xXGtrTeE,996
-bitunix_automated_crypto_trading-3.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bitunix_automated_crypto_trading-3.3.6.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
-bitunix_automated_crypto_trading-3.3.6.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
-bitunix_automated_crypto_trading-3.3.6.dist-info/RECORD,,
+bitunix_automated_crypto_trading/version.py,sha256=Z9dy-a-QtSCS4duPQWpgA6G-wTeWi6aUt5Wi1lK_Ltg,21
+bitunix_automated_crypto_trading-3.3.7.dist-info/METADATA,sha256=pppKFPixMGagASNAjEA4nu5lY9wTbslP4__00JOmNIk,996
+bitunix_automated_crypto_trading-3.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bitunix_automated_crypto_trading-3.3.7.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
+bitunix_automated_crypto_trading-3.3.7.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
+bitunix_automated_crypto_trading-3.3.7.dist-info/RECORD,,