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

bitunix_automated_crypto_trading/BitunixSignal.py

@@ -643,27 +643,21 @@ class BitunixSignal:
         del inuse1, inuse2, inuseTickers
         gc.collect()
 
-    async def get_duration_minutes_unixtime(self, trade_time_unix):
-        """Calculates the duration in minutes from trade time to current time."""
-        current_time_unix = int(time.time())  # Get current Unix timestamp
-        print(f"Current time (Unix): {current_time_unix}, Trade time (Unix): {trade_time_unix}")
-        duration_seconds = current_time_unix - trade_time_unix
-        duration_minutes = duration_seconds / 60  # Convert seconds to minutes
-        return round(duration_minutes)
-    
+   
     async def get_duration(self,datetime_str):
         """Calculates the duration in minutes from a given datetime string to the current time."""
         # Convert input datetime string to a datetime object
         trade_time = datetime.strptime(datetime_str, "%Y-%m-%d %H:%M:%S")
-        
-        # Convert datetime object to Unix timestamp
+        # 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}")
         # 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')}")
         # 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}")
         
         return round(duration_minutes)
 
@@ -812,7 +806,7 @@ class BitunixSignal:
             current_time = time.time() * 1000
             df=self.orderdf.copy(deep=False)
             for index, row in df.iterrows():
-                if current_time - int(row.ctime) > 6000000000:
+                if current_time - int(row.ctime) > 60000:
                     self.notifications.add_notification(
                         f'{colors.LBLUE} Canceling order {row.orderId}, {row.symbol} {row.qty} created at {row.rtime} '
                     )
@@ -829,8 +823,8 @@ class BitunixSignal:
 
                     # Calculate the duration in minutes since the position was opened
                     ctime = row['ctime']
-                    duration_minutes = await self.get_duration(ctime)
-                    no_of_candles_since_current_open = await self.calculate_candles(period, duration_minutes)
+                    #duration_minutes = await self.get_duration(ctime)
+                    #no_of_candles_since_current_open = await self.calculate_candles(period, duration_minutes)
                     
                     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}_trendline', f'{period}_candle_trend', f'{period}_trend', f'{period}_cb', f'{period}_barcolor']    
                     required_cols = set(requiredCols)
@@ -846,7 +840,7 @@ class BitunixSignal:
                             
                         if select and int(self.settings.MAX_AUTO_TRADES)!=0:
                             
-                            if self.settings.BOT_TRAIL_TP_SL and self.settings.PROFIT_PERCENTAGE > 0 and self.settings.LOSS_PERCENTAGE > 0:
+                            if self.settings.PROFIT_PERCENTAGE > 0 and self.settings.LOSS_PERCENTAGE > 0:
                                 last, bid, ask, mtv = await self.GetTickerBidLastAsk(row.symbol)
                                 price = (bid if side == "BUY" else ask if side == "SELL" else last) if bid<=last<=ask else last
                                 decimal_places = abs(Decimal(str(price)).as_tuple().exponent)                                
@@ -861,13 +855,17 @@ class BitunixSignal:
                                 old_tpPrice = None
                                 tpStopType = self.settings.SL_STOP_TYPE
                                 tpOrderType = self.settings.SL_ORDER_TYPE
+                                tpOrderPrice = None
 
                                 slPrice = None 
                                 slorderId = None
                                 old_slPrice = None
                                 slStopType = self.settings.SL_STOP_TYPE
                                 slOrderType = self.settings.SL_ORDER_TYPE
+                                slOrderPrice = None
 
+                                roi = round((row['unrealizedPNL'] / (row['qty'] * row['avgOpenPrice'])) * 100 * self.settings.LEVERAGE,2)
+                                
                                 datajs = await self.bitunixApi.GetPendingTpSlOrderData({'symbol': symbol})
                                 if datajs:
                                     for order in datajs:
@@ -885,33 +883,50 @@ class BitunixSignal:
                                             old_slPrice = slPrice
 
                                 # move TP and SL in the direction of profit
-                                midpoint =  tpPrice / (1 + self.settings.PROFIT_PERCENTAGE/100/self.settings.LEVERAGE) if side == "BUY" else tpPrice / (1 - self.settings.PROFIT_PERCENTAGE/100/self.settings.LEVERAGE) if tpPrice is not None else None
-                                if price > midpoint and side == "BUY" or price < midpoint and side == "SELL":
+                                tp_midpoint = None
+                                sl_midpoint = None
+                                if self.settings.BOT_TRAIL_TP:
+                                    if old_tpPrice is not None:
+                                        tp_midpoint =  old_tpPrice / (1 + self.settings.PROFIT_PERCENTAGE/100/self.settings.LEVERAGE) if side == "BUY" else old_tpPrice / (1 - self.settings.PROFIT_PERCENTAGE/100/self.settings.LEVERAGE) if tpPrice is not None else None
+                                    if tp_midpoint is not None and (price > tp_midpoint and side == "BUY" or price < tp_midpoint and side == "SELL"):
+
+                                        tpPrice = 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)
+                                        tpPrice = Decimal(await self.str_precision(tpPrice))
+                                        tpPrice =float(str(tpPrice.quantize(Decimal(f'1e-{decimal_places}'))))
+                                        tpOrderPrice = await self.decrement_by_last_decimal(str(tpPrice))
 
-                                    tpPrice = 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)
-                                    tpPrice = Decimal(await self.str_precision(tpPrice))
-                                    tpPrice =float(str(tpPrice.quantize(Decimal(f'1e-{decimal_places}'))))
-                                    tpOrderPrice = await self.decrement_by_last_decimal(str(tpPrice))
+                                            
+                                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
+                                    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)
-                                    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))
+                                        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} TP/SL midpoint is at {midpoint}'
+                                        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}'
                                     )
-                                    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}'
-                                        )
-                                    datajs2 = await self.bitunixApi.ModifyTpSlOrder({'orderId':tporderId,'tpPrice':str(tpPrice), 'tpOrderPrice':str(tpOrderPrice), 'tpQty':str(qty),'tpStopType':tpStopType,'tpOrderType':tpOrderType})
-                                    if datajs2 is not None:
-                                        self.notifications.add_notification(
-                                            f'{colors.CYAN} Take Profit order for {row.symbol} moved from {old_tpPrice} to {tpPrice}'
-                                        )
-                                            
+
+
+                                if self.settings.BOT_TRAIL_TP and tpPrice is not None and tpOrderPrice is not None:
+                                        datajs2 = await self.bitunixApi.ModifyTpSlOrder({'orderId':tporderId,'tpPrice':str(tpPrice), 'tpOrderPrice':str(tpOrderPrice), 'tpQty':str(qty),'tpStopType':tpStopType,'tpOrderType':tpOrderType})
+                                        if datajs2 is not None:
+                                            self.notifications.add_notification(
+                                                f'{colors.CYAN} Take Profit order for {row.symbol} moved from {old_tpPrice} to {tpPrice}'
+                                            )
+
+                                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 self.settings.BOT_CONTROLS_TP_SL:
                                 # check take profit amount or accept loss amount

bitunix_automated_crypto_trading/config.py

@@ -22,7 +22,8 @@ class Settings(BaseSettings):
     PROFIT_AMOUNT: float = Field(default=0, ge=0.0)
     LOSS_AMOUNT: float = Field(default=5.0, ge=0.0)
     BOT_CONTROLS_TP_SL: bool = Field(default=False)
-    BOT_TRAIL_TP_SL: bool = Field(default=False)
+    BOT_TRAIL_TP: bool = Field(default=False)
+    BOT_TRAIL_SL: bool = Field(default=False)
     TP_STOP_TYPE: str = Field(default="MARK_PRICE")
     TP_ORDER_TYPE: str = Field(default="LIMIT")
     SL_STOP_TYPE: str = Field(default="MARK_PRICE")

bitunix_automated_crypto_trading/version.py

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

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

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

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

@@ -1,6 +1,6 @@
 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=ke8KNlorfmmifTWhdFPUR63Zsl__gPRdalAqcdR6zSo,88174
+bitunix_automated_crypto_trading/BitunixSignal.py,sha256=bZjkTPT74iwWglfgAuHiJUppX1Xu_jPLFIaup1sxDAo,89701
 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
@@ -9,11 +9,11 @@ bitunix_automated_crypto_trading/ThreadManager.py,sha256=Lw5_1EIT0m3AFSv5CIMpnjt
 bitunix_automated_crypto_trading/TickerManager.py,sha256=CLd7pvE-qyYBPBauy--A54z7srmMMJsiaWcrY4ezFFU,41939
 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=J-YIrcbS-FOlLze1QvAocelYPA53thJODVyhuZwQW5E,5838
+bitunix_automated_crypto_trading/config.py,sha256=-gP54OFwQkSfJFCGvFW7kJ7z4n6fsLfG493cwcdp42g,5881
 bitunix_automated_crypto_trading/logger.py,sha256=NHnA5JZdUFkTAhB7i-1iCAwrdf1fxhDuRvJUkbKPi9Y,2923
-bitunix_automated_crypto_trading/version.py,sha256=tC7feJeEXvyWQbCx5glWxCoo1hKMycavaWn-uadNZ0E,21
-bitunix_automated_crypto_trading-3.3.5.dist-info/METADATA,sha256=gQpnt3MalX-CV_EokXNyadl2q679NfFj2Cw8bgtzudg,996
-bitunix_automated_crypto_trading-3.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bitunix_automated_crypto_trading-3.3.5.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
-bitunix_automated_crypto_trading-3.3.5.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
-bitunix_automated_crypto_trading-3.3.5.dist-info/RECORD,,
+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,,