bitunix-automated-crypto-trading 3.3.4__tar.gz → 3.3.6__tar.gz

{bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitunix_automated_crypto_trading
-Version: 3.3.4
+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.4 → bitunix_automated_crypto_trading-3.3.6}/README.md

@@ -61,10 +61,12 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
   - `LOSS_AMOUNT`: Maximum loss amount
   - `PROFIT_PERCENTAGE`: Target profit ROI percentage
   - `LOSS_PERCENTAGE`: Maximum loss ROI percentage
-  - `BOT_TAKE_PROFIT_STOP_LOSS`: True or False
+  - `BOT_CONTROLS_TP_SL`: True or False
       if false then take profit and stop loss will be placed by the bot when TP or SL is reached, if true then take profit and stop loss will be placed when the trade is opened
-  - `BOT_TRAIL_STOP_LOSS`: True or False
-      if set to True then bot will move the stop loss to breakeven when the trade is reaches 50% of the target profit and then move the stop loss to the 50% of the target profit when the trade reaches 90% of the target profit.
+  - `BOT_TRAIL_TP`
+      if set to True then bot will trail the TP in the direction of profit    
+  - `BOT_TRAIL_SL`
+      if set to True then bot will trail the SL in the direction of profit
   - `PROFIT_LOSS_PRICE_TYPE`: "MARK_PRICE" or "LAST_PRICE"
   - `PROFIT_LOSS_ORDER_TYPE`: "MARKET" or "LIMIT" 
   - `OPTION_MOVING_AVERAGE`: Moving average period (1h, 1d, 15m, 5m, 1m)
@@ -181,7 +183,8 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
     - 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
-    - Trailing TP and SL in the direction of profit, if BOT_TRAIL_STOP_LOSS to True and BOT_TAKE_PROFIT_STOP_LOSS to False in the config file
+    - BOT controled take profit and stop loss or take_profit and stop_loss create when order is created
+    - Trailing TP and SL in the direction of profit, if BOT_TRAIL_TP_SL to True and BOT_TAKE_PROFIT_STOP_LOSS to False in the config file
 
 ## Auto Trading
 

{bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.6}/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)
 
@@ -784,7 +778,7 @@ class BitunixSignal:
                                         f'{colors.YELLOW} Opening {"long" if side=="BUY" else "short"} position for {row.symbol} with {qty} qty @ {price})'
                                     )
                                     datajs = None
-                                    if self.settings.BOT_TAKE_PROFIT_STOP_LOSS:
+                                    if self.settings.BOT_CONTROLS_TP_SL:
                                         datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side)
                                     else:
                                         if tpPrice == 0 and slPrice == 0:
@@ -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_STOP_LOSS 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,35 +883,52 @@ 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_TAKE_PROFIT_STOP_LOSS:
+
+                                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
                                 if float(self.settings.LOSS_AMOUNT) > 0 and total_pnl < -float(self.settings.LOSS_AMOUNT):
                                     last, bid, ask, mtv = await self.GetTickerBidLastAsk(row.symbol)

{bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.6}/bitunix_automated_crypto_trading/config.py

@@ -21,8 +21,9 @@ class Settings(BaseSettings):
     LOSS_PERCENTAGE: float = Field(default=10, ge=0.0)
     PROFIT_AMOUNT: float = Field(default=0, ge=0.0)
     LOSS_AMOUNT: float = Field(default=5.0, ge=0.0)
-    BOT_TAKE_PROFIT_STOP_LOSS: bool = Field(default=False)
-    BOT_TRAIL_STOP_LOSS: bool = Field(default=False)
+    BOT_CONTROLS_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-3.3.6/bitunix_automated_crypto_trading/version.py

@@ -0,0 +1 @@
+__version__ = "3.3.6"

{bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.6}/bitunix_automated_crypto_trading.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitunix_automated_crypto_trading
-Version: 3.3.4
+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.4/bitunix_automated_crypto_trading/version.py

@@ -1 +0,0 @@
-__version__ = "3.3.4"