bitunix-automated-crypto-trading 3.3.0__tar.gz → 3.3.2__tar.gz

{bitunix_automated_crypto_trading-3.3.0 → bitunix_automated_crypto_trading-3.3.2}/PKG-INFO

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

{bitunix_automated_crypto_trading-3.3.0 → bitunix_automated_crypto_trading-3.3.2}/bitunix_automated_crypto_trading/BitunixApi.py

@@ -143,8 +143,8 @@ class BitunixApi:
                 "symbol": ticker,
                 "tradeSide":tradeSide,
                 "slPrice": slPrice,
-                "slStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
-                "slOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "slStopType": self.settings.STOP_LOSS_PRICE_TYPE,
+                "slOrderType": self.settings.STOP_LOSS_ORDER_TYPE,
                 "slOrderPrice": slOrderPrice,
                 "positionId":positionId
             }
@@ -158,8 +158,8 @@ class BitunixApi:
                 "symbol": ticker,
                 "tradeSide":tradeSide,
                 "tpPrice": tpPrice,
-                "tpStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
-                "tpOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "tpStopType": self.settings.TAKE_PROFIT_PRICE_TYPE,
+                "tpOrderType": self.settings.TAKE_PROFIT_ORDER_TYPE,
                 "tpOrderPrice":tpOrderPrice,
                 "positionId":positionId
             }
@@ -173,12 +173,12 @@ class BitunixApi:
                 "symbol": ticker,
                 "tradeSide":tradeSide,
                 "tpPrice": tpPrice,
-                "tpStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
-                "tpOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "tpStopType": self.settings.TAKE_PROFIT_PRICE_TYPE,
+                "tpOrderType": self.settings.TAKE_PROFIT_ORDER_TYPE,
                 "tpOrderPrice":tpOrderPrice,
                 "slPrice": slPrice,
-                "slStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
-                "slOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "slStopType": self.settings.STOP_LOSS_PRICE_TYPE,
+                "slOrderType": self.settings.STOP_LOSS_ORDER_TYPE,
                 "slOrderPrice": slOrderPrice,
                 "positionId":positionId
             }

{bitunix_automated_crypto_trading-3.3.0 → bitunix_automated_crypto_trading-3.3.2}/bitunix_automated_crypto_trading/BitunixSignal.py

@@ -716,7 +716,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():
-                        await asyncio.sleep(5)
+                        await asyncio.sleep(0.1)  # Allow other tasks to run
                         data=None
                         # Calculate the duration in minutes since the position was opened
                         data = await self.bitunixApi.GetPositionHistoryData({'symbol': row['symbol']})
@@ -725,7 +725,8 @@ class BitunixSignal:
                             xtime = float(data['positionList'][0]['mtime'])
                             mtime = pd.to_datetime(xtime, unit='ms').tz_localize('UTC').tz_convert(cst).strftime('%Y-%m-%d %H:%M:%S')
                             duration_minutes = await self.get_duration(mtime)
-                        if duration_minutes > self.settings.DELAY_IN_MINUTES_FOR_SAME_TICKER_TRADES or duration_minutes is None:
+                        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 ""
                             if side != "":
                                 select = True
@@ -748,7 +749,7 @@ class BitunixSignal:
                                     tpPrice=0
                                     tpOrderPrice=0
                                     if self.settings.PROFIT_AMOUNT > 0:
-                                        tpPrice = (price * qty + float(self.settings.PROFIT_AMOUNT))/qty if side == "BUY" else (price * qty - float(self.settings.PROFIT_AMOUNT))/qty
+                                        tpPrice = price + float(self.settings.PROFIT_AMOUNT)/qty if side == "BUY" else price - float(self.settings.PROFIT_AMOUNT)/qty
                                         tpPrice = Decimal(await self.str_precision(tpPrice))
                                         tpPrice =float(str(tpPrice.quantize(Decimal(f'1e-{decimal_places}'))))
                                         tpOrderPrice = await self.increment_by_last_decimal(str(tpPrice))
@@ -761,7 +762,7 @@ class BitunixSignal:
                                     slPrice=0
                                     slOrderPrice=0
                                     if self.settings.LOSS_AMOUNT > 0:
-                                        slPrice = (price * qty - float(self.settings.LOSS_AMOUNT))/qty if side == "BUY" else (price * qty + float(self.settings.LOSS_AMOUNT))/qty
+                                        slPrice = price - float(self.settings.LOSS_AMOUNT)/qty if side == "BUY" else price + float(self.settings.LOSS_AMOUNT)/qty
                                         slPrice = Decimal(await self.str_precision(slPrice))
                                         slPrice = float(str(slPrice.quantize(Decimal(f'1e-{decimal_places}'))))
                                         slOrderPrice = await self.increment_by_last_decimal(str(slPrice))
@@ -776,14 +777,17 @@ class BitunixSignal:
                                         f'{colors.YELLOW} Opening {"long" if side=="BUY" else "short"} position for {row.symbol} with {qty} qty @ {price})'
                                     )
                                     datajs = None
-                                    if tpPrice == 0 and slPrice == 0:
+                                    if self.settings.BOT_TAKE_PROFIT_STOP_LOSS:
                                         datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side)
-                                    elif tpPrice == 0:
-                                        datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, slPrice=slPrice, slOrderPrice=slOrderPrice)
-                                    elif slPrice == 0:
-                                        datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, tpPrice=tpPrice, tpOrderPrice=tpOrderPrice)
-                                    else:   
-                                        datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, tpPrice=tpPrice, tpOrderPrice=tpOrderPrice, slPrice=slPrice, slOrderPrice=slOrderPrice)
+                                    else:
+                                        if tpPrice == 0 and slPrice == 0:
+                                            datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side)
+                                        elif tpPrice == 0:
+                                            datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, slPrice=slPrice, slOrderPrice=slOrderPrice)
+                                        elif slPrice == 0:
+                                            datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, tpPrice=tpPrice, tpOrderPrice=tpOrderPrice)
+                                        else:   
+                                            datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, tpPrice=tpPrice, tpOrderPrice=tpOrderPrice, slPrice=slPrice, slOrderPrice=slOrderPrice)
                                     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")
@@ -834,7 +838,77 @@ class BitunixSignal:
                             select = False
                             
                         if select and int(self.settings.MAX_AUTO_TRADES)!=0:
-                        
+                            if self.settings.BOT_TAKE_PROFIT_STOP_LOSS:
+                                # 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)
+                                    price = (ask if row['side'] == "BUY" else bid if row['side'] == "SELL" else last) if bid<=last<=ask else last
+
+                                    self.notifications.add_notification(
+                                        f'{colors.CYAN} Closing {"long" if side=="BUY" else "short"} position due to stop loss amount for {row.symbol} with {row.qty} qty @ {price})'
+                                    )
+                                    datajs = await self.bitunixApi.PlaceOrder(
+                                        positionId=row.positionId,
+                                        ticker=row.symbol,
+                                        qty=row.qty,
+                                        price=price,
+                                        side=row.side,
+                                        tradeSide="CLOSE"
+                                    )
+                                    continue
+
+                                if float(self.settings.PROFIT_AMOUNT) > 0 and total_pnl > float(self.settings.PROFIT_AMOUNT):
+                                    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(
+                                        f'{colors.CYAN} Closing {"long" if side=="BUY" else "short"} position  due to take profit amount for {row.symbol} with {row.qty} qty @ {price})'
+                                    )
+                                    datajs = await self.bitunixApi.PlaceOrder(
+                                        positionId=row.positionId,
+                                        ticker=row.symbol,
+                                        qty=row.qty,
+                                        price=price,
+                                        side=row.side,
+                                        tradeSide="CLOSE"
+                                    )
+                                    continue
+
+                                # check take profit percentage or accept loss percentage
+                                if float(self.settings.LOSS_PERCENTAGE) > 0 and row['ROI'] < -float(self.settings.LOSS_PERCENTAGE):
+                                    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(
+                                        f'{colors.CYAN} Closing {"long" if side=="BUY" else "short"} position due to stop loss percentage for {row.symbol} with {row.qty} qty @ {price})'
+                                    )
+                                    datajs = await self.bitunixApi.PlaceOrder(
+                                        positionId=row.positionId,
+                                        ticker=row.symbol,
+                                        qty=row.qty,
+                                        price=price,
+                                        side=row.side,
+                                        tradeSide="CLOSE"
+                                    )
+                                    continue
+
+                                if float(self.settings.PROFIT_PERCENTAGE) > 0 and row['ROI'] > float(self.settings.PROFIT_PERCENTAGE):
+                                    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(
+                                        f'{colors.CYAN} Closing {"long" if side=="BUY" else "short"} position  due to take profit percentage for {row.symbol} with {row.qty} qty @ {price})'
+                                    )
+                                    datajs = await self.bitunixApi.PlaceOrder(
+                                        positionId=row.positionId,
+                                        ticker=row.symbol,
+                                        qty=row.qty,
+                                        price=price,
+                                        side=row.side,
+                                        tradeSide="CLOSE"
+                                    )
+                                    continue
+
                             # 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_close'] == "SELL":

{bitunix_automated_crypto_trading-3.3.0 → bitunix_automated_crypto_trading-3.3.2}/bitunix_automated_crypto_trading/config.py

@@ -21,8 +21,11 @@ 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)
-    PROFIT_LOSS_PRICE_TYPE: str = Field(default="MARK_PRICE")
-    PROFIT_LOSS_ORDER_TYPE: str = Field(default="LIMIT")
+    BOT_TAKE_PROFIT_STOP_LOSS: bool = Field(default=False)
+    TAKE_PROFIT_PRICE_TYPE: str = Field(default="MARK_PRICE")
+    TAKE_PROFIT_ORDER_TYPE: str = Field(default="LIMIT")
+    STOP_LOSS_PRICE_TYPE: str = Field(default="MARK_PRICE")
+    STOP_LOSS_ORDER_TYPE: str = Field(default="MARKET")
     OPTION_MOVING_AVERAGE: str = Field(default="1h")
     DELAY_IN_MINUTES_FOR_SAME_TICKER_TRADES: int = Field(default=15, ge=0)
     BARS: int = Field(default=100, ge=1)

bitunix_automated_crypto_trading-3.3.2/bitunix_automated_crypto_trading/version.py

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

{bitunix_automated_crypto_trading-3.3.0 → bitunix_automated_crypto_trading-3.3.2}/bitunix_automated_crypto_trading.egg-info/PKG-INFO

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

bitunix_automated_crypto_trading-3.3.0/bitunix_automated_crypto_trading/version.py

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