bitunix-automated-crypto-trading 3.2.9__py3-none-any.whl → 3.3.1__py3-none-any.whl

bitunix_automated_crypto_trading/BitunixApi.py

@@ -120,9 +120,9 @@ class BitunixApi:
         response.raise_for_status()
         return response.json()
 
-    async def PlaceOrder(self, ticker, qty, price, side, positionId=0, tradeSide="OPEN",reduceOnly=False, takeProfitPrice=0, stopLossPrice=0):
+    async def PlaceOrder(self, ticker, qty, price, side, positionId=0, tradeSide="OPEN",reduceOnly=False, tpPrice=0, tpOrderPrice=0, slPrice=0, slOrderPrice=0):
         datajs = None
-        if takeProfitPrice == 0 or stopLossPrice == 0:
+        if tpPrice == 0 and slPrice == 0:
             data = {
                 "side": side,
                 "orderType":"LIMIT",
@@ -134,7 +134,7 @@ class BitunixApi:
                 "positionId":positionId
             }
             datajs = await self._post_authenticated(self.placeOrder_Url,data)
-        elif takeProfitPrice == 0:
+        elif tpPrice == 0:
             data = {
                 "side": side,
                 "orderType":"LIMIT",
@@ -142,14 +142,14 @@ class BitunixApi:
                 "price": price,
                 "symbol": ticker,
                 "tradeSide":tradeSide,
-                "slPrice": stopLossPrice,
-                "slStopType":'MARK_PRICE',
+                "slPrice": slPrice,
                 "slStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
                 "slOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
+                "slOrderPrice": slOrderPrice,
                 "positionId":positionId
             }
             datajs = await self._post_authenticated(self.placeOrder_Url,data)
-        elif stopLossPrice == 0:
+        elif slPrice == 0:
             data = {
                 "side": side,
                 "orderType":"LIMIT",
@@ -157,10 +157,10 @@ class BitunixApi:
                 "price": price,
                 "symbol": ticker,
                 "tradeSide":tradeSide,
-                "tpPrice": takeProfitPrice,
+                "tpPrice": tpPrice,
                 "tpStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
                 "tpOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
-                "tpOrderPrice":takeProfitPrice,
+                "tpOrderPrice":tpOrderPrice,
                 "positionId":positionId
             }
             datajs = await self._post_authenticated(self.placeOrder_Url,data)
@@ -172,14 +172,14 @@ class BitunixApi:
                 "price": price,
                 "symbol": ticker,
                 "tradeSide":tradeSide,
-                "tpPrice": takeProfitPrice,
+                "tpPrice": tpPrice,
                 "tpStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
                 "tpOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
-                "tpOrderPrice":takeProfitPrice,
-                "slPrice": stopLossPrice,
+                "tpOrderPrice":tpOrderPrice,
+                "slPrice": slPrice,
                 "slStopType": self.settings.PROFIT_LOSS_PRICE_TYPE,
                 "slOrderType": self.settings.PROFIT_LOSS_ORDER_TYPE,
-                "slOrderPrice": stopLossPrice,
+                "slOrderPrice": slOrderPrice,
                 "positionId":positionId
             }
             datajs = await self._post_authenticated(self.placeOrder_Url,data)

bitunix_automated_crypto_trading/BitunixSignal.py

@@ -3,6 +3,8 @@ import pandas as pd
 import json
 import asyncio
 from datetime import datetime, timedelta, timezone
+from decimal import Decimal
+
 from collections import defaultdict
 import traceback
 import time
@@ -664,7 +666,18 @@ class BitunixSignal:
         
         return round(duration_minutes)
 
-    
+    async def str_precision(self,num):
+        num_decimal = Decimal(str(num))  # Convert to Decimal to preserve precision
+        decimal_places = abs(num_decimal.as_tuple().exponent)  # Get original decimal places
+        return f"{num:.{decimal_places}f}"  # Format with the original precision
+
+    async def increment_by_last_decimal(self, value_str):
+        value = Decimal(value_str)
+        # Count number of decimal places
+        decimal_places = abs(value.as_tuple().exponent)
+        increment = Decimal(f'1e-{decimal_places}')
+        return float(value + increment)
+
 
     async def calculate_candles(self, timeframe, duration_minutes):
         
@@ -703,14 +716,17 @@ 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():
-                        
-                        # Calculate the duration in minutes since the position was opened
                         await asyncio.sleep(5)
+                        data=None
+                        # Calculate the duration in minutes since the position was opened
                         data = await self.bitunixApi.GetPositionHistoryData({'symbol': row['symbol']})
-                        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:
+                        duration_minutes = None
+                        if data and 'positionList' in data and len(data['positionList']) > 0:
+                            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)
+                        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
@@ -721,37 +737,54 @@ class BitunixSignal:
                                 if self.pendingOrders and len(self.pendingOrders['orderList']) == 1:
                                     select = False
                                 if select:
+                                    balance = float(self.portfoliodf["available"].iloc[0]) + float(self.portfoliodf["crossUnrealizedPNL"].iloc[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
+                                    qty= str(max(balance * (float(self.settings.ORDER_AMOUNT_PERCENTAGE) / 100 ) / price * int(self.settings.LEVERAGE),mtv))
 
-                                    tp_price=0
+                                    decimal_places = abs(Decimal(str(price)).as_tuple().exponent)
+                                    
+                                    tpPrice=0
+                                    tpOrderPrice=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))
+                                        tpPrice = (price * qty + float(self.settings.PROFIT_AMOUNT))/qty if side == "BUY" else (price * qty - 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))
                                     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)
+                                        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.increment_by_last_decimal(await self.str_precision(tpPrice))
 
-                                    lp_price=0
+                                    slPrice=0
+                                    slOrderPrice=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))
+                                        slPrice = (price * qty - float(self.settings.LOSS_AMOUNT))/qty if side == "BUY" else (price * qty + 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))
                                     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)
+                                        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))
                                         
-                                    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))
 
                                     self.notifications.add_notification(
                                         f'{colors.YELLOW} Opening {"long" if side=="BUY" else "short"} position for {row.symbol} with {qty} qty @ {price})'
                                     )
                                     datajs = None
-                                    if tp_price == 0 and lp_price == 0:
+                                    if tpPrice == 0 and slPrice == 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)
+                                    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, takeProfitPrice=tp_price, stopLossPrice=lp_price)
+                                        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")

bitunix_automated_crypto_trading/version.py

@@ -1 +1 @@
-__version__ = "3.2.9"
+__version__ = "3.3.1"

{bitunix_automated_crypto_trading-3.2.9.dist-info → bitunix_automated_crypto_trading-3.3.1.dist-info}/METADATA

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

{bitunix_automated_crypto_trading-3.2.9.dist-info → bitunix_automated_crypto_trading-3.3.1.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=NnvI8_PhliZmNEJHjwV6-AwDixU2sBFpTrtItVkyz58,13545
-bitunix_automated_crypto_trading/BitunixSignal.py,sha256=rKwPJ-XbKNRryxZFBxV1ED6nqho9Uvqcwuqeo2eMM8c,74699
+bitunix_automated_crypto_trading/BitunixApi.py,sha256=P5lAToQDl-q8yjLD0bH3G8ajY_fxx3XKet0rS9UP7Pg,13504
+bitunix_automated_crypto_trading/BitunixSignal.py,sha256=AbOhi9ehn_QY7ZAVlU_fnIUNKWoVKuy7VLZIE2v75kU,77286
 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
@@ -11,9 +11,9 @@ bitunix_automated_crypto_trading/__init__.py,sha256=1hzk6nX8NnUCr1tsq8oFq1qGCNhN
 bitunix_automated_crypto_trading/bitunix.py,sha256=lxwnYARxldA2oU6GdjupilXIlnUh4RX8rQLCOn7x13I,27143
 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=2stnwoFx_N57ue44omsLCY3PMJmR-I2ZBFSGy-Dn8kM,21
-bitunix_automated_crypto_trading-3.2.9.dist-info/METADATA,sha256=8e5lNlFeNHBH0fnqHs_p9RgQ4dKIx_bfaUtwBq1CBEg,996
-bitunix_automated_crypto_trading-3.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bitunix_automated_crypto_trading-3.2.9.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
-bitunix_automated_crypto_trading-3.2.9.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
-bitunix_automated_crypto_trading-3.2.9.dist-info/RECORD,,
+bitunix_automated_crypto_trading/version.py,sha256=vFVFOckEr44mXptQFYzU0w8rn7ILjARfK9BoWOrTJxA,21
+bitunix_automated_crypto_trading-3.3.1.dist-info/METADATA,sha256=pjC1qj0p9YPnHNXbIfllgnuedbaHWH61mk9tgBqrHJo,996
+bitunix_automated_crypto_trading-3.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bitunix_automated_crypto_trading-3.3.1.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
+bitunix_automated_crypto_trading-3.3.1.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
+bitunix_automated_crypto_trading-3.3.1.dist-info/RECORD,,