OctoBot-Trading 2.4.175__tar.gz → 2.4.177__tar.gz

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/CHANGELOG.md

@@ -4,6 +4,21 @@ 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.177] - 2025-05-20
+### Added 
+[Orders] add inactive orders to handle simultaneous stop & Take profit spot orders
+
+## [2.4.176] - 2025-05-20
+### Added
+[Orders] custom volume in get_valid_split_orders
+[Exchanges] add hyperliquid
+### Updated
+[Exchange] warn on expected error in load markets
+[Orders] ensure created order amount is always set
+### Fixed
+[Portfolio] fix < 0 sub portfolio issue
+[Positions] fix position reversing order and pnl
+
 ## [2.4.175] - 2025-05-13
 ### Fixed
 [Portfolio] fix different fees discount

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -165,6 +165,10 @@ octobot_trading/personal_data/orders/order_state.py
 octobot_trading/personal_data/orders/order_util.py
 octobot_trading/personal_data/orders/orders_manager.py
 octobot_trading/personal_data/orders/orders_storage_operations.py
+octobot_trading/personal_data/orders/active_order_swap_strategies/__init__.py
+octobot_trading/personal_data/orders/active_order_swap_strategies/active_order_swap_strategy.py
+octobot_trading/personal_data/orders/active_order_swap_strategies/stop_first_active_order_swap_strategy.py
+octobot_trading/personal_data/orders/active_order_swap_strategies/take_profit_first_active_order_swap_strategy.py
 octobot_trading/personal_data/orders/channel/__init__.py
 octobot_trading/personal_data/orders/channel/orders.py
 octobot_trading/personal_data/orders/channel/orders_updater.py
@@ -188,6 +192,9 @@ octobot_trading/personal_data/orders/trailing_profiles/trailing_price_step.py
 octobot_trading/personal_data/orders/trailing_profiles/trailing_profile.py
 octobot_trading/personal_data/orders/trailing_profiles/trailing_profile_factory.py
 octobot_trading/personal_data/orders/trailing_profiles/trailing_profile_types.py
+octobot_trading/personal_data/orders/triggers/__init__.py
+octobot_trading/personal_data/orders/triggers/base_trigger.py
+octobot_trading/personal_data/orders/triggers/price_trigger.py
 octobot_trading/personal_data/orders/types/__init__.py
 octobot_trading/personal_data/orders/types/unknown_order.py
 octobot_trading/personal_data/orders/types/unsupported_order.py
@@ -376,6 +383,10 @@ tests/personal_data/orders/test_order_factory.py
 tests/personal_data/orders/test_order_util.py
 tests/personal_data/orders/test_orders_manager.py
 tests/personal_data/orders/test_orders_storage_operations.py
+tests/personal_data/orders/active_order_swap_strategies/__init__.py
+tests/personal_data/orders/active_order_swap_strategies/test_active_order_swap_strategy.py
+tests/personal_data/orders/active_order_swap_strategies/test_stop_first_active_order_swap_strategy.py
+tests/personal_data/orders/active_order_swap_strategies/test_take_profit_first_active_order_swap_strategy.py
 tests/personal_data/orders/groups/__init__.py
 tests/personal_data/orders/groups/test_balanced_take_profit_and_stop_order_group.py
 tests/personal_data/orders/groups/test_group_util.py
@@ -393,6 +404,9 @@ tests/personal_data/orders/states/test_pending_creation_order_state.py
 tests/personal_data/orders/trailing_profiles/__init__.py
 tests/personal_data/orders/trailing_profiles/test_filled_take_profit_trailing_profile.py
 tests/personal_data/orders/trailing_profiles/test_trailing_profile_factory.py
+tests/personal_data/orders/triggers/__init__.py
+tests/personal_data/orders/triggers/test_base_trigger.py
+tests/personal_data/orders/triggers/test_price_trigger.py
 tests/personal_data/orders/types/__init__.py
 tests/personal_data/orders/types/test_unknown_order.py
 tests/personal_data/orders/types/limit/__init__.py

{OctoBot-Trading-2.4.175/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.177}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/api/__init__.py

@@ -188,6 +188,7 @@ from octobot_trading.api.profitability import (
 )
 from octobot_trading.api.orders import (
     get_open_orders,
+    get_all_orders,
     get_pending_creation_orders,
     get_order_exchange_name,
     order_to_dict,
@@ -379,6 +380,7 @@ __all__ = [
     "get_reference_market",
     "get_initializing_currencies_prices",
     "get_open_orders",
+    "get_all_orders",
     "get_pending_creation_orders",
     "get_order_exchange_name",
     "order_to_dict",

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/api/orders.py

@@ -44,8 +44,12 @@ async def create_order(exchange_manager,
     )
 
 
-def get_open_orders(exchange_manager, symbol=None) -> list:
-    return exchange_manager.exchange_personal_data.orders_manager.get_open_orders(symbol=symbol)
+def get_open_orders(exchange_manager, symbol=None, active=None) -> list:
+    return exchange_manager.exchange_personal_data.orders_manager.get_open_orders(symbol=symbol, active=active)
+
+
+def get_all_orders(exchange_manager, symbol=None, active=None) -> list:
+    return exchange_manager.exchange_personal_data.orders_manager.get_all_orders(symbol=symbol, active=active)
 
 
 def get_pending_creation_orders(exchange_manager) -> list:

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/constants.py

@@ -40,6 +40,7 @@ ALLOW_SIMULATED_ORDERS_INSTANT_FILL = os_util.parse_boolean_environment_var(
 
 # Order creation
 ORDER_DATA_FETCHING_TIMEOUT = 5 * commons_constants.MINUTE_TO_SECONDS
+ACTIVE_ORDER_STRATEGY_SWAP_TIMEOUT = 2 * commons_constants.MINUTE_TO_SECONDS
 CHAINED_ORDER_PRICE_FETCHING_TIMEOUT = 1    # should be instant or ignored
 CHAINED_ORDERS_OUTDATED_PRICE_ALLOWANCE = decimal.Decimal("0.005")  # allows 0.5% outdated price error
 # create instantly filled limit orders 0.5% beyond market
@@ -136,6 +137,7 @@ TESTED_EXCHANGES = [
     "coinbase",
     "cryptocom",
     "htx",
+    "hyperliquid",
     "bitget",
     "gateio",
     "ascendex",

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/enums.py

@@ -334,6 +334,7 @@ class ExchangeConstantsOrderColumns(enum.Enum):
     ENTRIES = "entries"
     VOLUME = "volume"
     BROKER_APPLIED = "broker_applied"
+    IS_ACTIVE = "is_active"
 
 
 class TradeExtraConstants(enum.Enum):
@@ -552,9 +553,15 @@ class TradingSignalOrdersAttrs(enum.Enum):
     POST_ONLY = "post_only"
     GROUP_ID = "group_id"
     GROUP_TYPE = "group_type"
+    ACTIVE_SWAP_STRATEGY_TYPE = "active_swap_strategy_type"
+    ACTIVE_SWAP_STRATEGY_TIMEOUT = "active_swap_strategy_timeout"
+    ACTIVE_SWAP_STRATEGY_TRIGGER_CONFIG = "active_swap_strategy_trigger_config"
     TAG = "tag"
     ORDER_ID = "order_id"
     TRAILING_PROFILE_TYPE = "trailing_profile_type"
+    IS_ACTIVE = "is_active"
+    ACTIVE_TRIGGER_PRICE = "active_trigger_price"
+    ACTIVE_TRIGGER_ABOVE = "active_trigger_above"
     TRAILING_PROFILE = "trailing_profile"
     BUNDLED_WITH = "bundled_with"
     CHAINED_TO = "chained_to"
@@ -587,7 +594,14 @@ class StoredOrdersAttr(enum.Enum):
     GROUP = "gr"
     GROUP_ID = "gi"
     GROUP_TYPE = "gt"
+    ORDER_SWAP_STRATEGY = "oss"
+    STRATEGY_TYPE = "sty"
+    STRATEGY_TIMEOUT = "sti"
+    STRATEGY_TRIGGER_CONFIG = "stc"
     CHAINED_ORDERS = "co"
+    ACTIVE_TRIGGER = "at"
+    ACTIVE_TRIGGER_PRICE = "atp"
+    ACTIVE_TRIGGER_ABOVE = "ata"
     TRAILING_PROFILE = "tp"
     TRAILING_PROFILE_TYPE = "tpt"
     TRAILING_PROFILE_DETAILS = "tpd"
@@ -620,3 +634,8 @@ class TradingModeActivityType(enum.Enum):
     CREATED_ORDERS = "created_orders"
     NOTHING_TO_DO = "nothing_to_do"
     NO_ACTIVITY = None
+
+
+class ActiveOrderSwapTriggerPriceConfiguration(enum.Enum):
+    FILLING_PRICE = "filling_price"
+    ORDER_PARAMS_ONLY = "order_params_only"

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -177,8 +177,13 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                     raise ccxt.AuthenticationError(
                         f"Invalid key format ({html_util.get_html_summary_if_relevant(err)})"
                     ) from err
-                # should never happen: if it does, propagate it
-                self.logger.error(f"Unexpected error when loading markets: {err} ({err.__class__.__name__})")
+                # should not happen: if it does, propagate it
+                if self.exchange_manager.exchange.CAN_MAKE_AUTHENTICATED_REQUESTS_WHEN_LOADING_MARKETS:
+                    # can happen, just warn
+                    self.logger.warning(f"{err.__class__.__name__} when loading markets: {err}")
+                else:
+                    # unexpected: notify
+                    self.logger.error(f"Unexpected error when loading markets: {err} ({err.__class__.__name__})")
                 raise
             except ccxt.ExchangeNotAvailable as err:
                 raise octobot_trading.errors.FailedRequest(

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/exchanges/exchange_factory.py

@@ -67,7 +67,7 @@ async def create_real_exchange(exchange_manager, exchange_config_by_exchange: ty
             or exchange_manager.disable_unauth_retry
         ):
             # auth is required or already retried, don't loop
-            exchange_manager.logger.error(
+            exchange_manager.logger.warning(
                 f"Authentication is required and raised an error: impossible to connect to "
                 f"{exchange_manager.exchange_name} exchange: {err}"
             )

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/exchanges/traders/trader.py

@@ -58,6 +58,7 @@ class Trader(util.Initializable):
         if not hasattr(self, 'simulate'):
             self.simulate = False
         self.is_enabled = self.__class__.enabled(self.config)
+        self.enable_inactive_orders = not self.simulate
 
     async def initialize_impl(self):
         self.is_enabled = self.is_enabled and self.exchange_manager.is_trading
@@ -72,6 +73,9 @@ class Trader(util.Initializable):
     def enabled(cls, config):
         return util.is_trader_enabled(config)
 
+    def set_enable_inactive_orders(self, enabled: bool):
+        self.enable_inactive_orders = enabled
+
     def set_risk(self, risk):
         min_risk = decimal.Decimal(str(octobot_commons.constants.CONFIG_TRADER_RISK_MIN))
         max_risk = decimal.Decimal(str(octobot_commons.constants.CONFIG_TRADER_RISK_MAX))
@@ -116,8 +120,7 @@ class Trader(util.Initializable):
         try:
             params = params or {}
             self.logger.info(f"Creating order: {created_order}")
-            created_order = await self._create_new_order(order, params, wait_for_creation=wait_for_creation,
-                                                         creation_timeout=creation_timeout)
+            created_order = await self._create_new_order(order, params, wait_for_creation, creation_timeout)
             if created_order is None:
                 self.logger.warning(f"Order not created on {self.exchange_manager.exchange_name} "
                                     f"(failed attempt to create: {order}). This is likely due to "
@@ -186,7 +189,7 @@ class Trader(util.Initializable):
                 disabled_state_updater = self.exchange_manager.exchange_personal_data \
                     .orders_manager.enable_order_auto_synchronization is False
                 # now that we got the lock, ensure we can edit the order
-                if not self.simulate and not order.is_self_managed() and (
+                if not self.simulate and order.is_active and not order.is_self_managed() and (
                     order.state is not None or disabled_state_updater
                 ):
                     if disabled_state_updater:
@@ -264,16 +267,18 @@ class Trader(util.Initializable):
         await self.exchange_manager.exchange_personal_data.handle_portfolio_and_position_update_from_order(order)
         return changed
 
-    async def _create_new_order(self, new_order, params: dict,
-                                wait_for_creation=True,
-                                creation_timeout=octobot_trading.constants.INDIVIDUAL_ORDER_SYNC_TIMEOUT) -> object:
+    async def _create_new_order(
+        self, new_order, params: dict, wait_for_creation: bool, creation_timeout: float
+    ):
         """
         Creates an exchange managed order, it might be a simulated or a real order.
         Portfolio will be updated by the created order state after order will be initialized
         """
         updated_order = new_order
         is_pending_creation = False
-        if not self.simulate and not new_order.is_self_managed():
+        if not self.simulate and not new_order.is_self_managed() and (
+            new_order.is_in_active_inactive_transition or new_order.is_active
+        ):
             order_params = self.exchange_manager.exchange.get_order_additional_params(new_order)
             order_params.update(new_order.exchange_creation_params)
             order_params.update(params)
@@ -313,6 +318,11 @@ class Trader(util.Initializable):
             updated_order.associated_entry_ids = new_order.associated_entry_ids
             updated_order.update_with_triggering_order_fees = new_order.update_with_triggering_order_fees
             updated_order.trailing_profile = new_order.trailing_profile
+            if new_order.active_trigger is not None:
+                updated_order.use_active_trigger(order_util.create_order_price_trigger(
+                    updated_order, new_order.active_trigger.trigger_price, new_order.active_trigger.trigger_above
+                ))
+            updated_order.is_in_active_inactive_transition = new_order.is_in_active_inactive_transition
 
             if is_pending_creation:
                 # register order as pending order, it will then be added to live orders in order manager once open
@@ -320,11 +330,19 @@ class Trader(util.Initializable):
                     updated_order
                 )
 
-        await updated_order.initialize()
-        if is_pending_creation and wait_for_creation \
-                and updated_order.state is not None and updated_order.state.is_pending()\
-                and self.exchange_manager.exchange_personal_data.orders_manager.enable_order_auto_synchronization:
-            await updated_order.state.wait_for_terminate(creation_timeout)
+        try:
+            await updated_order.initialize()
+            if is_pending_creation and wait_for_creation \
+                    and updated_order.state is not None and updated_order.state.is_pending()\
+                    and self.exchange_manager.exchange_personal_data.orders_manager.enable_order_auto_synchronization:
+                await updated_order.state.wait_for_terminate(creation_timeout)
+            if new_order.is_in_active_inactive_transition:
+                # transition successful: new_order is now inactive
+                await new_order.on_active_from_inactive()
+        finally:
+            if updated_order.is_in_active_inactive_transition:
+                # transition completed: never leave is_in_active_inactive_transition to True after transition
+                updated_order.is_in_active_inactive_transition = False
         return updated_order
 
     def get_take_profit_order_type(self, base_order, order_type: enums.TraderOrderType) -> enums.TraderOrderType:
@@ -385,6 +403,36 @@ class Trader(util.Initializable):
         order.add_chained_order(chained_order)
         self.logger.info(f"Added chained order [{chained_order}] to [{order}] order.")
 
+    async def update_order_as_inactive(
+        self, order, ignored_order=None, wait_for_cancelling=True,
+        cancelling_timeout=octobot_trading.constants.INDIVIDUAL_ORDER_SYNC_TIMEOUT
+    ) -> bool:
+        if not self.enable_inactive_orders:
+            self.logger.error(f"Can't update order as inactive when {self.enable_inactive_orders=}.")
+            return False
+        cancelled = False
+        if order and order.is_open():
+            with order.active_or_inactive_transition():
+                cancelled = await self._handle_order_cancellation(
+                    order, ignored_order, wait_for_cancelling, cancelling_timeout
+                )
+        else:
+            self.logger.error(f"Can't update order as inactive: {order} is not open on exchange.")
+        return cancelled
+
+    async def update_order_as_active(
+        self, order, params: dict = None, wait_for_creation=True, raise_all_creation_error=False,
+        creation_timeout=octobot_trading.constants.INDIVIDUAL_ORDER_SYNC_TIMEOUT
+    ):
+        if not self.enable_inactive_orders:
+            self.logger.error(f"Can't update order as active when {self.enable_inactive_orders=}.")
+            return order
+        with order.active_or_inactive_transition():
+            return await self.create_order(
+                order, loaded=False, params=params, wait_for_creation=wait_for_creation,
+                raise_all_creation_error=raise_all_creation_error, creation_timeout=creation_timeout
+            )
+
     async def cancel_order(self, order, ignored_order=None,
                            wait_for_cancelling=True,
                            cancelling_timeout=octobot_trading.constants.INDIVIDUAL_ORDER_SYNC_TIMEOUT) -> bool:
@@ -400,11 +448,12 @@ class Trader(util.Initializable):
         :param cancelling_timeout: time before raising a timeout error when waiting for an order cancel
         :return: None
         """
-        if order and order.is_open():
+        if order and order.is_open() or not order.is_active:
             self.logger.info(f"Cancelling order: {order}")
             # always cancel this order first to avoid infinite loop followed by deadlock
-            return await self._handle_order_cancellation(order, ignored_order,
-                                                         wait_for_cancelling, cancelling_timeout)
+            return await self._handle_order_cancellation(
+                order, ignored_order, wait_for_cancelling, cancelling_timeout
+            )
         return False
 
     async def _handle_order_cancellation(
@@ -417,7 +466,7 @@ class Trader(util.Initializable):
             return success
         order_status = None
         # if real order: cancel on exchange
-        if not self.simulate and not order.is_self_managed():
+        if not self.simulate and order.is_active and not order.is_self_managed():
             try:
                 async with order.lock:
                     try:

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/exchanges/types/rest_exchange.py

@@ -72,6 +72,8 @@ class RestExchange(abstract_exchange.AbstractExchange):
     EXPECT_POSSIBLE_ORDER_NOT_FOUND_DURING_ORDER_CREATION = False  # set True when get_order() can return None
     # (order not found) when orders are being created on exchange and are not fully processed on the exchange side.
     REQUIRES_AUTHENTICATION = False  # set True when even normally public apis require authentication
+    # set True when even loading markets can make auth calls when creds are set
+    CAN_MAKE_AUTHENTICATED_REQUESTS_WHEN_LOADING_MARKETS = False
     HAS_FETCHED_DETAILS = False  # set True when this exchange details (urls etc) have to be fetched before
     # starting the exchange
     IS_SKIPPING_EMPTY_CANDLES_IN_OHLCV_FETCH = False    # set True when the exchange is known for not returning any
@@ -204,7 +206,7 @@ class RestExchange(abstract_exchange.AbstractExchange):
                     stop_price=stop_price, side=side, current_price=current_price,
                     reduce_only=reduce_only, params=params)
                 self.logger.debug(f"Created order: {created_order}")
-                return await self._verify_order(created_order, order_type, symbol, price, side)
+                return await self._verify_order(created_order, order_type, symbol, price, quantity, side)
         return None
 
     async def edit_order(self, exchange_order_id: str, order_type: enums.TraderOrderType, symbol: str,
@@ -225,7 +227,7 @@ class RestExchange(abstract_exchange.AbstractExchange):
             edited_order = await self._edit_order(exchange_order_id, order_type, symbol, quantity=float_quantity,
                                                   price=float_price, stop_price=float_stop_price, side=side,
                                                   current_price=float_current_price, params=params)
-            order = await self._verify_order(edited_order, order_type, symbol, price, side)
+            order = await self._verify_order(edited_order, order_type, symbol, price, quantity, side)
             return order
         return None
 
@@ -310,7 +312,7 @@ class RestExchange(abstract_exchange.AbstractExchange):
                 f"Unexpected error during order operation: {html_util.get_html_summary_if_relevant(e)}"
             )
 
-    async def _verify_order(self, created_order, order_type, symbol, price, side, get_order_params=None):
+    async def _verify_order(self, created_order, order_type, symbol, price, quantity, side, get_order_params=None):
         # some exchanges are not returning the full order details on creation: fetch it if necessary
         if created_order and not self._ensure_order_details_completeness(created_order):
             if ecoc.EXCHANGE_ID.value in created_order:
@@ -332,9 +334,13 @@ class RestExchange(abstract_exchange.AbstractExchange):
                 else:
                     created_order = fetched_order
 
-        # on some exchange, market order are not including price, add it manually to ensure uniformity
-        if created_order is not None and created_order[ecoc.PRICE.value] is None and price is not None:
-            created_order[ecoc.PRICE.value] = float(price)
+        if created_order is not None:
+            # on some exchange, market order are not including price, add it manually to ensure uniformity
+            if created_order[ecoc.PRICE.value] is None and price is not None:
+                created_order[ecoc.PRICE.value] = float(price)
+            # sometimes, amount is 0, this is impossible. If it is, restore amount
+            if not created_order[ecoc.AMOUNT.value] and quantity is not None:
+                created_order[ecoc.AMOUNT.value] = float(quantity)
 
         return created_order
 

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/modes/channel/abstract_mode_producer.py

@@ -96,6 +96,9 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
         self._is_trigger_completed = asyncio.Event()
         self._is_trigger_completed.set()
 
+        # used to avoid spamming critical issues
+        self._sent_critical_notifications: set[str] = set()
+
         self.last_activity: mode_activity.TradingModeActivity = mode_activity.TradingModeActivity()
 
     def on_reload_config(self):
@@ -570,3 +573,19 @@ class AbstractTradingModeProducer(modes_channel.ModeChannelProducer):
             cls.PRODUCER_LOCKS_BY_EXCHANGE_ID.pop(
                 exchange_manager.id, None
             )
+
+    async def sent_once_critical_notification(self, title: str, description: str):
+        if description not in self._sent_critical_notifications:
+            try:
+                import octobot_services.api as services_api
+                import octobot_services.enums as services_enum
+                self.logger.error(f"Critical error: {title}: {description}")
+                await services_api.send_notification(services_api.create_notification(
+                    description, title=title, markdown_text=description,
+                    level=services_enum.NotificationLevel.CRITICAL,
+                    category=services_enum.NotificationCategory.GLOBAL_INFO
+                ))
+            except ImportError as e:
+                self.logger.exception(e, True, f"Impossible to send notification: {e}")
+            finally:
+                self._sent_critical_notifications.add(description)

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/personal_data/__init__.py

@@ -54,10 +54,14 @@ from octobot_trading.personal_data.orders import (
     wait_for_order_fill,
     apply_order_storage_details_if_any,
     create_orders_storage_related_elements,
-    create_missing_self_managed_orders_from_storage_order_groups,
+    create_missing_virtual_orders_from_storage_order_groups,
     is_associated_pending_order,
     apply_pending_order_from_created_order,
     get_up_to_date_price,
+    create_order_price_trigger,
+    create_as_active_order_using_strategy_if_any,
+    create_as_active_order_on_exchange,
+    update_order_as_inactive_on_exchange,
     get_potentially_outdated_price,
     get_pre_order_data,
     get_portfolio_amounts,
@@ -74,6 +78,11 @@ from octobot_trading.personal_data.orders import (
     TrailingProfileTypes,
     create_trailing_profile,
     create_filled_take_profit_trailing_profile,
+    ActiveOrderSwapStrategy,
+    StopFirstActiveOrderSwapStrategy,
+    TakeProfitFirstActiveOrderSwapStrategy,
+    BaseTrigger,
+    PriceTrigger,
     OrdersUpdater,
     adapt_price,
     get_minimal_order_amount,
@@ -293,10 +302,14 @@ __all__ = [
     "wait_for_order_fill",
     "apply_order_storage_details_if_any",
     "create_orders_storage_related_elements",
-    "create_missing_self_managed_orders_from_storage_order_groups",
+    "create_missing_virtual_orders_from_storage_order_groups",
     "is_associated_pending_order",
     "apply_pending_order_from_created_order",
     "get_up_to_date_price",
+    "create_order_price_trigger",
+    "create_as_active_order_using_strategy_if_any",
+    "create_as_active_order_on_exchange",
+    "update_order_as_inactive_on_exchange",
     "get_potentially_outdated_price",
     "get_pre_order_data",
     "get_portfolio_amounts",
@@ -313,6 +326,11 @@ __all__ = [
     "TrailingProfileTypes",
     "create_trailing_profile",
     "create_filled_take_profit_trailing_profile",
+    "ActiveOrderSwapStrategy",
+    "StopFirstActiveOrderSwapStrategy",
+    "TakeProfitFirstActiveOrderSwapStrategy",
+    "BaseTrigger",
+    "PriceTrigger",
     "OrdersUpdater",
     "adapt_price",
     "get_minimal_order_amount",

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/personal_data/exchange_personal_data.py

@@ -14,6 +14,7 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
 import asyncio
+import decimal
 import uuid
 import typing
 
@@ -294,6 +295,24 @@ class ExchangePersonalData(util.Initializable):
             self.logger.exception(e, True, f"Failed to update order : {e}")
             return False
 
+    async def check_and_update_inactive_orders_when_necessary(
+        self, symbol: str, current_price: decimal.Decimal, price_time: float,
+        strategy_timeout: typing.Optional[float], wait_for_fill_callback: typing.Optional[typing.Callable]
+    ) -> int:
+        handled_orders_count = 0
+        sorted_inactive_orders = sorted(
+            self.orders_manager.get_all_orders(symbol=symbol, active=False),
+            key= lambda o: o.origin_price if o.trigger_above else -o.origin_price
+        )
+        for order in sorted_inactive_orders:
+            if order.should_become_active(price_time, current_price):
+                handled_orders_count += 1
+                try:
+                    await order.on_active_trigger(strategy_timeout, wait_for_fill_callback)
+                except Exception as err:
+                    self.logger.exception(err, True, f"Failed order on_active_trigger {err} (order: {order})")
+        return handled_orders_count
+
     async def handle_trade_update(self, symbol, trade_id, trade,
                                   is_old_trade: bool = False, should_notify: bool = True):
         try:

{OctoBot-Trading-2.4.175 → OctoBot-Trading-2.4.177}/octobot_trading/personal_data/orders/__init__.py

@@ -39,6 +39,17 @@ from octobot_trading.personal_data.orders.trailing_profiles import (
     create_trailing_profile,
     create_filled_take_profit_trailing_profile,
 )
+from octobot_trading.personal_data.orders import active_order_swap_strategies
+from octobot_trading.personal_data.orders.active_order_swap_strategies import (
+    ActiveOrderSwapStrategy,
+    StopFirstActiveOrderSwapStrategy,
+    TakeProfitFirstActiveOrderSwapStrategy,
+)
+from octobot_trading.personal_data.orders import triggers
+from octobot_trading.personal_data.orders.triggers import (
+    BaseTrigger,
+    PriceTrigger,
+)
 from octobot_trading.personal_data.orders import order
 from octobot_trading.personal_data.orders.order import (
     Order,
@@ -110,6 +121,10 @@ from octobot_trading.personal_data.orders.order_util import (
     is_stop_trade_order_type,
     is_take_profit_order,
     get_trade_order_type,
+    create_order_price_trigger,
+    create_as_active_order_using_strategy_if_any,
+    create_as_active_order_on_exchange,
+    update_order_as_inactive_on_exchange,
     create_as_chained_order,
     is_associated_pending_order,
     apply_pending_order_from_created_order,
@@ -123,7 +138,7 @@ from octobot_trading.personal_data.orders import orders_storage_operations
 from octobot_trading.personal_data.orders.orders_storage_operations import (
     apply_order_storage_details_if_any,
     create_orders_storage_related_elements,
-    create_missing_self_managed_orders_from_storage_order_groups,
+    create_missing_virtual_orders_from_storage_order_groups,
 )
 from octobot_trading.personal_data.orders import order_adapter
 from octobot_trading.personal_data.orders.order_adapter import (
@@ -180,6 +195,10 @@ __all__ = [
     "parse_is_pending_cancel",
     "parse_is_open",
     "get_up_to_date_price",
+    "create_order_price_trigger",
+    "create_as_active_order_using_strategy_if_any",
+    "create_as_active_order_on_exchange",
+    "update_order_as_inactive_on_exchange",
     "get_potentially_outdated_price",
     "get_pre_order_data",
     "get_portfolio_amounts",
@@ -193,7 +212,7 @@ __all__ = [
     "generate_order_id",
     "wait_for_order_fill",
     "apply_order_storage_details_if_any",
-    "create_missing_self_managed_orders_from_storage_order_groups",
+    "create_missing_virtual_orders_from_storage_order_groups",
     "is_associated_pending_order",
     "apply_pending_order_from_created_order",
     "OrderState",
@@ -209,6 +228,11 @@ __all__ = [
     "TrailingProfileTypes",
     "create_trailing_profile",
     "create_filled_take_profit_trailing_profile",
+    "ActiveOrderSwapStrategy",
+    "StopFirstActiveOrderSwapStrategy",
+    "TakeProfitFirstActiveOrderSwapStrategy",
+    "BaseTrigger",
+    "PriceTrigger",
     "OrdersUpdater",
     "adapt_price",
     "get_minimal_order_amount",