bitunix-automated-crypto-trading 3.2.6__py3-none-any.whl → 3.2.8__py3-none-any.whl

bitunix_automated_crypto_trading/BitunixApi.py

@@ -18,6 +18,7 @@ class BitunixApi:
         self.api_key = api_key
         self.secret_key = secret_key
         self.logger = logger
+        self.settings = settings
         self.session = requests.Session()
         self.session.headers.update({
             'Content-Type': 'application/json',
@@ -119,18 +120,70 @@ class BitunixApi:
         response.raise_for_status()
         return response.json()
 
-    async def PlaceOrder(self, ticker, qty, price, side, positionId=0, tradeSide="OPEN",reduceOnly=False):
-        data = {
-            "side": side,
-            "orderType":"LIMIT",
-            "qty":  qty,
-            "price": price,
-            "symbol": ticker,
-            "tradeSide":tradeSide,
-            "reduceOnly":reduceOnly,
-            "positionId":positionId
-        }
-        datajs = await self._post_authenticated(self.placeOrder_Url,data)
+    async def PlaceOrder(self, ticker, qty, price, side, positionId=0, tradeSide="OPEN",reduceOnly=False, takeProfitPrice=0, stopLossPrice=0):
+        datajs = None
+        if takeProfitPrice == 0 or stopLossPrice == 0:
+            data = {
+                "side": side,
+                "orderType":"LIMIT",
+                "qty":  qty,
+                "price": price,
+                "symbol": ticker,
+                "tradeSide":tradeSide,
+                "reduceOnly":reduceOnly,
+                "positionId":positionId
+            }
+            datajs = await self._post_authenticated(self.placeOrder_Url,data)
+        elif takeProfitPrice == 0:
+            data = {
+                "side": side,
+                "orderType":"LIMIT",
+                "qty":  qty,
+                "price": price,
+                "symbol": ticker,
+                "tradeSide":tradeSide,
+                "slPrice": stopLossPrice,
+                "slStopType":'MARK_PRICE',
+                "slStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
+                "slpOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "positionId":positionId
+            }
+            datajs = await self._post_authenticated(self.placeOrder_Url,data)
+        elif stopLossPrice == 0:
+            data = {
+                "side": side,
+                "orderType":"LIMIT",
+                "qty":  qty,
+                "price": price,
+                "symbol": ticker,
+                "tradeSide":tradeSide,
+                "tpPrice": takeProfitPrice,
+                "tpStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
+                "tppOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "tpOrderPrice":takeProfitPrice,
+                "positionId":positionId
+            }
+            datajs = await self._post_authenticated(self.placeOrder_Url,data)
+        else:
+            data = {
+                "side": side,
+                "orderType":"LIMIT",
+                "qty":  qty,
+                "price": price,
+                "symbol": ticker,
+                "tradeSide":tradeSide,
+                "tpPrice": takeProfitPrice,
+                "tpStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
+                "tppOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "tpOrderPrice":takeProfitPrice,
+                "slPrice": stopLossPrice,
+                "slStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
+                "slpOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "slOrderPrice": stopLossPrice,
+                "positionId":positionId
+            }
+            datajs = await self._post_authenticated(self.placeOrder_Url,data)
+            
         return datajs
 
     async def FlashClose(self, positionId):

bitunix_automated_crypto_trading/BitunixSignal.py

@@ -721,14 +721,36 @@ class BitunixSignal:
                                     select = False
                                 if select:
                                     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
+
+                                    tp_price=0
+                                    if self.settings.PROFIT_AMOUNT > 0:
+                                        tp_price = price * (1 + float(self.settings.PROFIT_AMOUNT)) if side == "BUY" else price * (1 - float(self.settings.PROFIT_AMOUNT))
+                                    if self.settings.PROFIT_PERCENTAGE > 0 or self.settings.PROFIT_AMOUNT > 0:
+                                        tp_price = 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)
+
+                                    lp_price=0
+                                    if self.settings.LOSS_AMOUNT > 0:
+                                        lp_price = price * (1 - float(self.settings.LOSS_AMOUNT)) if side == "BUY" else price * (1 + float(self.settings.LOSS_AMOUNT))
+                                    if self.settings.LOSS_PERCENTAGE > 0 or self.settings.LOSS_AMOUNT > 0:
+                                        lp_price = 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)
+                                        
                                     balance = float(self.portfoliodf["available"].iloc[0]) + float(self.portfoliodf["crossUnrealizedPNL"].iloc[0])
-                                    qty= str(max(balance * (float(self.settings.ORDER_AMOUNT_PERCENTAGE) / 100) / price * int(self.settings.LEVERAGE),mtv))
+                                    qty= str(max(balance * (float(self.settings.ORDER_AMOUNT_PERCENTAGE) / 100 ) / price * int(self.settings.LEVERAGE),mtv))
 
                                     self.notifications.add_notification(
                                         f'{colors.YELLOW} Opening {"long" if side=="BUY" else "short"} position for {row.symbol} with {qty} qty @ {price})'
                                     )
-                                    datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side)
+                                    datajs = None
+                                    if tp_price == 0 and lp_price == 0:
+                                        datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side)
+                                    elif tp_price == 0:
+                                        datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, stopLossPrice=lp_price)
+                                    elif lp_price == 0:
+                                        datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, takeProfitPrice=tp_price)
+                                    else:   
+                                        datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side, takeProfitPrice=tp_price, stopLossPrice=lp_price)
                                     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")
@@ -746,7 +768,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) > 60000:
+                if current_time - int(row.ctime) > 6000000000:
                     self.notifications.add_notification(
                         f'{colors.LBLUE} Canceling order {row.orderId}, {row.symbol} {row.qty} created at {row.rtime} '
                     )
@@ -780,76 +802,6 @@ class BitunixSignal:
                             
                         if select and int(self.settings.MAX_AUTO_TRADES)!=0:
                         
-                            # 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/config.py

@@ -21,6 +21,8 @@ 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")
     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/version.py

@@ -1 +1 @@
-__version__ = "3.2.6"
+__version__ = "3.2.8"

{bitunix_automated_crypto_trading-3.2.6.dist-info → bitunix_automated_crypto_trading-3.2.8.dist-info}/METADATA

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

{bitunix_automated_crypto_trading-3.2.6.dist-info → bitunix_automated_crypto_trading-3.2.8.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=2mX5_ilayORr-AqyjRV388gYCE71yTQgFB3v6eOSK7o,11292
-bitunix_automated_crypto_trading/BitunixSignal.py,sha256=BZ1NBDCghHHtOvWgT6AxSbKg009SFUAziAeS8EYh0N4,77261
+bitunix_automated_crypto_trading/BitunixApi.py,sha256=m9eY6mVax82d1gFvwVkIkn8rgxSBbvRP-7emxUX99eE,13549
+bitunix_automated_crypto_trading/BitunixSignal.py,sha256=FzYwh43L1VXMrhKNQhX435pazZ933hfhY_FxXc_LrLk,74652
 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=E6U08wO1LKY4XctB6frtoAmlactMng3xwRrqG59qDt8,43030
 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=tt3ccEllSAaRW6Iz3UQ93uKJPoCMN0CR9bstybgvAsE,5536
+bitunix_automated_crypto_trading/config.py,sha256=7h8GvMH1SFuFPhKM3azA2pVS0w2CRzKtUankhI-IKHY,5655
 bitunix_automated_crypto_trading/logger.py,sha256=NHnA5JZdUFkTAhB7i-1iCAwrdf1fxhDuRvJUkbKPi9Y,2923
-bitunix_automated_crypto_trading/version.py,sha256=1HjPiFBzp_U6RzL9z5kdjdDM-BdteyLYu6nyaSant0w,21
-bitunix_automated_crypto_trading-3.2.6.dist-info/METADATA,sha256=aoZ7hyI1cwL436Crz2acDMvJ-aP4WEfdoN2G6f0pNkQ,996
-bitunix_automated_crypto_trading-3.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bitunix_automated_crypto_trading-3.2.6.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
-bitunix_automated_crypto_trading-3.2.6.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
-bitunix_automated_crypto_trading-3.2.6.dist-info/RECORD,,
+bitunix_automated_crypto_trading/version.py,sha256=SKNhDsZ81Bke2WUvgUQFQ7DVlPfRwWZkO5mgyJWSzxo,21
+bitunix_automated_crypto_trading-3.2.8.dist-info/METADATA,sha256=M8KtEy_NidCclMGbRkimkMRjthP5ShKLpsEwmZhnv8g,996
+bitunix_automated_crypto_trading-3.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bitunix_automated_crypto_trading-3.2.8.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
+bitunix_automated_crypto_trading-3.2.8.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
+bitunix_automated_crypto_trading-3.2.8.dist-info/RECORD,,