OctoBot-Trading 2.4.160__tar.gz → 2.4.161__tar.gz

{OctoBot-Trading-2.4.160 → OctoBot-Trading-2.4.161}/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.161] - 2025-03-05
+### Fixed
+[Orders] fix stop orders sync issues
+[TradingModes] don't interrupt orders creation when canceling orders fails
+
 ## [2.4.160] - 2025-03-03
 ### Added
 [CCXT] fix fees computation

{OctoBot-Trading-2.4.160 → OctoBot-Trading-2.4.161/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.160
+Version: 2.4.161
 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.160](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.161](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.160/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.161}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.160
+Version: 2.4.161
 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.160](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.161](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.160 → OctoBot-Trading-2.4.161}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.160](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.161](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.160 → OctoBot-Trading-2.4.161}/octobot_trading/__init__.py

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

{OctoBot-Trading-2.4.160 → OctoBot-Trading-2.4.161}/octobot_trading/exchanges/abstract_exchange.py

@@ -755,7 +755,13 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
         except decimal.DecimalException:
             quantity = octobot_trading.constants.ZERO
         try:
-            price = decimal.Decimal(str(order[enums.ExchangeConstantsOrderColumns.PRICE.value] or 0))
+            price = decimal.Decimal(str(
+                order[enums.ExchangeConstantsOrderColumns.PRICE.value]
+                # when fetching stop/tp orders PRICE might not be set, also check STOP_PRICE and TAKE_PROFIT_PRICE
+                or order.get(enums.ExchangeConstantsOrderColumns.STOP_PRICE.value, 0)
+                or order.get(enums.ExchangeConstantsOrderColumns.TAKE_PROFIT_PRICE.value, 0)
+                or 0
+            ))
         except decimal.DecimalException:
             price = octobot_trading.constants.ZERO
         side = enums.TradeOrderSide(

{OctoBot-Trading-2.4.160 → OctoBot-Trading-2.4.161}/octobot_trading/modes/abstract_trading_mode.py

@@ -464,12 +464,18 @@ class AbstractTradingMode(abstract_tentacle.AbstractTentacle):
         return False
 
     def get_historical_config(self) -> dict:
-        if self.historical_master_config is None:
-            self.historical_master_config = copy.deepcopy(self.trading_config)
         return octobot_commons.configuration.get_historical_tentacle_config(
-            self.historical_master_config, self.exchange_manager.exchange.get_exchange_current_time()
+            self.get_historical_master_config(), self.exchange_manager.exchange.get_exchange_current_time()
         )
 
+    def get_historical_master_config(self):
+        if self.historical_master_config is None:
+            self.historical_master_config = copy.deepcopy(self.trading_config)
+        return self.historical_master_config
+
+    def supports_historical_config(self) -> bool:
+        return common_constants.CONFIG_HISTORICAL_CONFIGURATION in self.get_historical_master_config()
+
     def has_historical_config(self) -> bool:
         try:
             octobot_commons.configuration.get_oldest_historical_tentacle_config_time(self.trading_config)

{OctoBot-Trading-2.4.160 → OctoBot-Trading-2.4.161}/octobot_trading/modes/channel/abstract_mode_producer.py

@@ -49,7 +49,6 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
         common_enums.ActivationTopics.EVALUATION_CYCLE.value:
             channels_name.OctoBotEvaluatorsChannelsName.MATRIX_CHANNEL.value,
     }
-    CONFIG_INIT_TIMEOUT = 1 * common_constants.MINUTE_TO_SECONDS    # let time for orders to be fetched before
     # declaring timeout at first trigger
     PRODUCER_LOCKS_BY_EXCHANGE_ID = {}  # use to identify exchange-wide actions
 
@@ -180,7 +179,7 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
             await self._subscribe_to_registration_topic(registration_topics, currency_filter, symbol_filter)
         await self.init_user_inputs(False)
         await self._wait_for_bot_init(
-            self.CONFIG_INIT_TIMEOUT,
+            self._get_config_init_timeout(),
             extra_symbol_topics=self.get_extra_init_symbol_topics(),
             extra_global_topics=self.get_extra_global_topics()
         )
@@ -366,7 +365,7 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
                     raise asyncio.TimeoutError(f"Trading mode producer has to be started in backtesting")
                 self.logger.debug("Waiting for orders initialization to proceed")
                 try:
-                    await asyncio.wait_for(self._is_ready_to_trade.wait(), self.CONFIG_INIT_TIMEOUT)
+                    await asyncio.wait_for(self._is_ready_to_trade.wait(), self._get_config_init_timeout())
                 except asyncio.TimeoutError as e:
                     raise errors.InitializingError() from e
                 self.logger.debug("Order initialized")
@@ -434,9 +433,14 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
                     and (side is None or (side is order.side))
                     and (exchange_order_ids is None or (order.exchange_order_id in exchange_order_ids))
                 ):
-                    if await self.trading_mode.cancel_order(order):
-                        cancelled = True
-                    else:
+                    try:
+                        if await self.trading_mode.cancel_order(order):
+                            cancelled = True
+                        else:
+                            failed_to_cancel = True
+                    except errors.OctoBotExchangeError as err:
+                        # do not propagate exchange error when canceling order
+                        self.logger.exception(err, True, f"Error when cancelling order [{order}]: {err}")
                         failed_to_cancel = True
         return cancelled and not failed_to_cancel
 
@@ -527,7 +531,7 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
         if context.exchange_manager.is_future:
             if not self._is_ready_to_trade.is_set():
                 await util.wait_for_topic_init(
-                    self.exchange_manager, self.CONFIG_INIT_TIMEOUT,
+                    self.exchange_manager, self._get_config_init_timeout(),
                     common_enums.InitializationEventExchangeTopics.CONTRACTS.value,
                     symbols=self.trading_mode.get_init_symbols()
                 )
@@ -545,6 +549,11 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
             self.logger.error(f"Symbol price initialization took more than {timeout} seconds")
         return False
 
+    def _get_config_init_timeout(self) -> int:
+        if self.exchange_manager and self.exchange_manager.is_backtesting:
+            return 1    # in backesting, init should be almost instant. If it's not, wait for yp to 1 second
+        return 1 * common_constants.MINUTE_TO_SECONDS  # let time for orders to be fetched before
+
     @classmethod
     def producer_exchange_wide_lock(cls, exchange_manager) -> asyncio_tools.RLock():
         try:

{OctoBot-Trading-2.4.160 → OctoBot-Trading-2.4.161}/octobot_trading/modes/scripted_trading_mode/abstract_scripted_trading_mode.py

@@ -178,7 +178,7 @@ class AbstractScriptedTradingModeProducer(modes_channel.AbstractTradingModeProdu
         # fake a full candle call
         cryptocurrency, symbol, time_frame = self._get_initialization_call_args()
         # wait for symbol data to be initialized
-        candle = await self._wait_for_symbol_init(symbol, time_frame, self.CONFIG_INIT_TIMEOUT)
+        candle = await self._wait_for_symbol_init(symbol, time_frame, self._get_config_init_timeout())
         if candle is None:
             self.logger.error(f"Can't initialize trading script: {symbol} {time_frame} candles are not fetched")
         await self.ohlcv_callback(self.exchange_name, self.exchange_manager.id, cryptocurrency, symbol, time_frame,

{OctoBot-Trading-2.4.160 → OctoBot-Trading-2.4.161}/octobot_trading/personal_data/exchange_personal_data.py

@@ -188,6 +188,8 @@ class ExchangePersonalData(util.Initializable):
         if self._is_out_of_sync_order(exchange_order_id):
             self.logger.debug(f"Ignored update for order with exchange id: {exchange_order_id}: this order "
                               f"has already been closed (received raw order: {raw_order})")
+            # ensure order is not in open orders anymore
+            self._ensure_canceled_out_of_sync_order(exchange_order_id)
         else:
             try:
                 changed, order = await self.orders_manager.upsert_order_from_raw(
@@ -209,6 +211,19 @@ class ExchangePersonalData(util.Initializable):
                 self.logger.exception(e, True, f"Failed to update order : {e}")
         return False, None
 
+    def _ensure_canceled_out_of_sync_order(self, exchange_order_id: str):
+        try:
+            out_of_sync_open_order = self.orders_manager.get_order(None, exchange_order_id=exchange_order_id)
+            # order should be removed from open orders to avoid looping in refresh
+            self.orders_manager.remove_order_instance(out_of_sync_open_order)
+            self.logger.info(
+                f"Out of sync order with exchange id {exchange_order_id} has been cancelled. "
+                f"Order: {out_of_sync_open_order}."
+            )
+        except KeyError:
+            # order is not in open orders anymore: nothing to do
+            pass
+
     async def update_order_from_stored_data(self, exchange_order_id, pending_groups):
         order = self.orders_manager.get_order(None, exchange_order_id=exchange_order_id)
         previous_order_id = order.order_id