OctoBot-Trading 2.4.186__tar.gz → 2.4.188__tar.gz

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.188] - 2025-06-08
+### Updated
+[Constants] increase default max order count to 100
+
+## [2.4.187] - 2025-06-08
+### Updated
+[Exchanges] make fees more flexible
+
 ## [2.4.186] - 2025-06-05
 ### Updated
 [Orders] add ensure_orders_limit

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.186
+Version: 2.4.188
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.186](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.188](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.186/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.188}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.186
+Version: 2.4.188
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.186](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.188](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.186](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.188](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/octobot_trading/__init__.py

@@ -15,4 +15,4 @@
 #  License along with this library.
 
 PROJECT_NAME = "OctoBot-Trading"
-VERSION = "2.4.186"  # major.minor.revision
+VERSION = "2.4.188"  # major.minor.revision

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/octobot_trading/constants.py

@@ -46,8 +46,8 @@ CHAINED_ORDERS_OUTDATED_PRICE_ALLOWANCE = decimal.Decimal("0.005")  # allows 0.5
 # create instantly filled limit orders 0.5% beyond market
 INSTANT_FILLED_LIMIT_ORDER_PRICE_DELTA = decimal.Decimal("0.005")
 CREATED_ORDER_FORCED_UPDATE_PERIOD = 5
-DEFAULT_MAX_DEFAULT_ORDERS_COUNT = 50
-DEFAULT_MAX_STOP_ORDERS_COUNT = 5
+DEFAULT_MAX_DEFAULT_ORDERS_COUNT = 100
+DEFAULT_MAX_STOP_ORDERS_COUNT = 10
 
 # Portfolio
 MAX_PORTFOLIO_SYNC_ATTEMPTS = 1

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/octobot_trading/enums.py

@@ -399,6 +399,13 @@ class ExchangeConstantsMarketPropertyColumns(enum.Enum):
     TAKER = "taker"  # trading
     MAKER = "maker"  # trading
     FEE = "fee"  # withdraw
+    FEE_SIDE = "feeSide"  # pay fees in the currency you give or get
+
+
+class ExchangeFeeSides(enum.Enum):
+    GET = "get"  # the fee is always in the currency you get
+    GIVE = "give"  # the fee is always in the currency you give
+    QUOTE = "quote"  # the fee is always in quote currency
 
 
 class ExchangeConstantsLeveragePropertyColumns(enum.Enum):

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/octobot_trading/errors.py

@@ -354,3 +354,9 @@ class ExhaustedTrailingProfileError(Exception):
     """
     Raised when a trailing profile has no new price to produce anymore
     """
+
+
+class MissingFeeDetailsError(Exception):
+    """
+    Raised when fee info are not available
+    """

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -889,19 +889,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         raise RuntimeError(f"Unknown order type: {order_type}")
 
     def get_trade_fee(self, symbol: str, order_type: enums.TraderOrderType, quantity, price, taker_or_maker):
-        limit_or_market_order_type = (
-            enums.TradeOrderType.MARKET
-            if taker_or_maker == enums.ExchangeConstantsMarketPropertyColumns.TAKER.value
-            else enums.TradeOrderType.LIMIT
-        )
-        fees = self.client.calculate_fee(
-            symbol=symbol,
-            type=limit_or_market_order_type.value,
-            side=exchanges.get_order_side(order_type),
-            amount=float(quantity),
-            price=float(price),
-            takerOrMaker=taker_or_maker
-        )
+        fees = self.calculate_fees(symbol, order_type, quantity, price, taker_or_maker)
         fees[enums.FeePropertyColumns.IS_FROM_EXCHANGE.value] = False
         fees[enums.FeePropertyColumns.COST.value] = decimal.Decimal(
             str(fees.get(enums.FeePropertyColumns.COST.value) or 0)
@@ -920,6 +908,24 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 fees[enums.FeePropertyColumns.CURRENCY.value] = parsed_symbol.quote
         return fees
 
+    def calculate_fees(
+        self, symbol: str, order_type: enums.TraderOrderType,
+        quantity: decimal.Decimal, price: decimal.Decimal, taker_or_maker: str
+    ):
+        limit_or_market_order_type = (
+            enums.TradeOrderType.MARKET
+            if taker_or_maker == enums.ExchangeConstantsMarketPropertyColumns.TAKER.value
+            else enums.TradeOrderType.LIMIT
+        )
+        return self.client.calculate_fee(
+            symbol=symbol,
+            type=limit_or_market_order_type.value,
+            side=exchanges.get_order_side(order_type),
+            amount=float(quantity),
+            price=float(price),
+            takerOrMaker=taker_or_maker
+        )
+
     def get_fees(self, symbol):
         try:
             return ccxt_client_util.get_fees(self.client.market(symbol))

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/octobot_trading/exchanges/connectors/simulator/exchange_simulator_connector.py

@@ -258,6 +258,17 @@ class ExchangeSimulatorConnector(abstract_exchange.AbstractExchange):
     #     'is_from_exchange': False, // simulated fees
     # }
     def get_trade_fee(self, symbol: str, order_type: enums.TraderOrderType, quantity, price, taker_or_maker):
+        fees = self.calculate_fees(symbol, order_type, quantity, price, taker_or_maker)
+        fees[enums.FeePropertyColumns.IS_FROM_EXCHANGE.value] = False
+        fees[enums.FeePropertyColumns.COST.value] = decimal.Decimal(
+            str(fees.get(enums.FeePropertyColumns.COST.value) or 0)
+        )
+        return fees
+
+    def calculate_fees(
+        self, symbol: str, order_type: enums.TraderOrderType,
+        quantity: decimal.Decimal, price: decimal.Decimal, taker_or_maker: str
+    ):
         if not taker_or_maker:
             taker_or_maker = enums.ExchangeConstantsMarketPropertyColumns.TAKER.value
         base, quote = symbol_util.parse_symbol(symbol).base_and_quote()
@@ -274,7 +285,6 @@ class ExchangeSimulatorConnector(abstract_exchange.AbstractExchange):
             enums.FeePropertyColumns.CURRENCY.value: fee_currency,
             enums.FeePropertyColumns.RATE.value: rate,
             enums.FeePropertyColumns.COST.value: cost,
-            enums.FeePropertyColumns.IS_FROM_EXCHANGE.value: False,
         }
 
     def _get_fees_currency(self, base, quote, order_type: enums.TraderOrderType):
@@ -282,6 +292,11 @@ class ExchangeSimulatorConnector(abstract_exchange.AbstractExchange):
             return quote
         return base
 
+    @classmethod
+    def register_simulator_connector_fee_methods(cls, exchange_name: str, simulator_connector):
+        # override when using custom fees in backtesting is necessary
+        pass
+
     def get_time_frames(self, importer):
         return time_frame_manager.sort_time_frames(list(set(backtesting_api.get_available_time_frames(importer)) &
                                                         set(self.exchange_manager.exchange_config.available_time_frames)),

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/octobot_trading/exchanges/implementations/exchange_simulator.py

@@ -54,6 +54,10 @@ class ExchangeSimulator(rest_exchange.RestExchange):
         self.exchange_importers = self.connector.exchange_importers
         if self.connector.should_adapt_market_statuses():
             await self._init_exchange_tentacle()
+        if self.exchange_tentacle_class:
+            self.exchange_tentacle_class.DEFAULT_CONNECTOR_CLASS.register_simulator_connector_fee_methods(
+                self.exchange_manager.exchange_name, self.connector
+            )
 
     async def _init_exchange_tentacle(self):
         origin_ignore_config = self.exchange_manager.ignore_config

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/tests/exchanges/__init__.py

@@ -75,6 +75,9 @@ class MockedCCXTConnector(CCXTConnector):
     def _should_authenticate(self):
         return False
 
+    def register_simulator_connector_fee_methods(self, *args, **kwargs):
+        pass
+
 
 class MockedRestExchange(DefaultRestExchange):
     DEFAULT_CONNECTOR_CLASS = MockedCCXTConnector

{OctoBot-Trading-2.4.186 → OctoBot-Trading-2.4.188}/tests/exchanges/test_exchange_simulator.py

@@ -118,6 +118,7 @@ async def test_init_exchange_tentacle(backtesting_trader):
     init_adapter = mock.Mock()
 
     class AdapterTentacle:
+        DEFAULT_CONNECTOR_CLASS = mock.Mock()
         def __init__(self, *_, **__):
             self.get_adapter_class = mock.Mock(
                 return_value=init_adapter
@@ -125,6 +126,7 @@ async def test_init_exchange_tentacle(backtesting_trader):
             self.stop = mock.AsyncMock()
 
     class NoAdapterTentacle:
+        DEFAULT_CONNECTOR_CLASS = mock.Mock()
         def __init__(self, *_, **__):
             self.get_adapter_class = mock.Mock(
                 return_value=None