OctoBot-Trading 2.4.140__tar.gz → 2.4.142__tar.gz

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/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.142] - 2025-01-07
+### Fixed
+[Order] fix _create_triggered_chained_order
+
+## [2.4.141] - 2025-01-05
+### Added
+[TradingSignals] add positions and leverage update
+
 ## [2.4.140] - 2025-01-03
 ### Updated
 [Positions] properly clear closed positions

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/api/__init__.py

@@ -210,6 +210,7 @@ from octobot_trading.api.contracts import (
     get_pair_contracts,
     is_handled_contract,
     has_pair_future_contract,
+    update_pair_contract,
     load_pair_contract,
     create_default_future_contract,
 )
@@ -386,6 +387,7 @@ __all__ = [
     "get_pair_contracts",
     "is_handled_contract",
     "has_pair_future_contract",
+    "update_pair_contract",
     "load_pair_contract",
     "create_default_future_contract",
     "set_is_exclusively_using_exchange_position_details",

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/api/contracts.py

@@ -38,6 +38,10 @@ def has_pair_future_contract(exchange_manager, pair: str) -> bool:
     return exchange_manager.exchange.has_pair_future_contract(pair)
 
 
+def update_pair_contract(exchange_manager, pair: str, leverage: decimal.Decimal):
+    get_pair_contracts(exchange_manager)[pair].current_leverage = leverage
+
+
 def load_pair_contract(exchange_manager, contract_dict: dict):
     exchange_data.update_future_contract_from_dict(exchange_manager, contract_dict)
 

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/enums.py

@@ -521,6 +521,7 @@ class TradingSignalAttrs(enum.Enum):
 
 class TradingSignalTopics(enum.Enum):
     ORDERS = "orders"
+    POSITIONS = "positions"
     PORTFOLIO = "portfolio"
 
 
@@ -559,6 +560,15 @@ class TradingSignalOrdersAttrs(enum.Enum):
     UPDATE_WITH_TRIGGERING_ORDER_FEES = "update_with_triggering_order_fees"
 
 
+class TradingSignalPositionsAttrs(enum.Enum):
+    EXCHANGE = "exchange"
+    EXCHANGE_TYPE = "exchange_type"
+    STRATEGY = "strategy"
+    SYMBOL = "symbol"
+    SIDE = "side"
+    LEVERAGE = "leverage"
+
+
 class TradingSignalOrdersActions(enum.Enum):
     CREATE = "create"
     ADD_TO_GROUP = "add_to_group"
@@ -566,6 +576,10 @@ class TradingSignalOrdersActions(enum.Enum):
     CANCEL = "cancel"
 
 
+class TradingSignalPositionsActions(enum.Enum):
+    EDIT = "edit"
+
+
 class StoredOrdersAttr(enum.Enum):
     GROUP = "gr"
     GROUP_ID = "gi"

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/errors.py

@@ -272,6 +272,12 @@ class OrderDescriptionNotFoundError(Exception):
     """
 
 
+class PositionDescriptionNotFoundError(Exception):
+    """
+    Raised when a position description is not found
+    """
+
+
 class AdapterError(Exception):
     """
     Raised when an error occurs in an adapter

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/exchange_data/contracts/margin_contract.py

@@ -13,6 +13,8 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
+import decimal
+
 import octobot_commons.logging as logging
 
 import octobot_trading.enums as enums
@@ -24,12 +26,12 @@ class MarginContract:
                  contract_size=constants.ONE,
                  maximum_leverage=constants.ONE,
                  current_leverage=constants.ONE):
-        self.pair = pair
+        self.pair: str = pair
         self.margin_type = margin_type
 
-        self.contract_size = contract_size
-        self.maximum_leverage = maximum_leverage
-        self.current_leverage = current_leverage
+        self.contract_size: decimal.Decimal = contract_size
+        self.maximum_leverage: decimal.Decimal = maximum_leverage
+        self.current_leverage: decimal.Decimal = current_leverage
 
         self.risk_limit = {}
 
@@ -47,7 +49,12 @@ class MarginContract:
         :param new_leverage: the leverage value to check
         :return: True if valid
         """
-        return 0 < new_leverage if self.maximum_leverage is None else 0 < new_leverage <= self.maximum_leverage
+        dec_leverage = decimal.Decimal(str(new_leverage))
+        return (
+            constants.ZERO < dec_leverage
+            if self.maximum_leverage is None
+            else constants.ZERO < dec_leverage <= self.maximum_leverage
+        )
 
     def set_current_leverage(self, new_leverage):
         """

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/exchanges/traders/trader.py

@@ -779,13 +779,16 @@ class Trader(util.Initializable):
         async with self.exchange_manager.exchange_personal_data.portfolio_manager.portfolio.lock:
             await self.exchange_manager.exchange_personal_data.handle_portfolio_update_from_withdrawal(amount, currency)
 
-    async def set_leverage(self, symbol, side, leverage):
+    async def set_leverage(
+        self, symbol: str, side: typing.Optional[enums.PositionSide], leverage: decimal.Decimal
+    ) -> bool:
         """
         Updates the symbol contract leverage
         Can raise InvalidLeverageValue if leverage value is not matching requirements
         :param symbol: the symbol to update
         :param side: the side to update (TODO)
         :param leverage: the new leverage value
+        :return True if leverage changed
         """
         contract = self.exchange_manager.exchange.get_pair_future_contract(symbol)
         if not contract.check_leverage_update(leverage):
@@ -793,12 +796,11 @@ class Trader(util.Initializable):
                                               f"but maximal value is {contract.maximum_leverage}")
         if contract.current_leverage != leverage:
             if not self.simulate:
-                await self.exchange_manager.exchange.set_symbol_leverage(
-                    symbol=symbol,
-                    leverage=leverage
-                )
+                await self.exchange_manager.exchange.set_symbol_leverage(symbol, float(leverage))
             self.logger.info(f"Switching {symbol} leverage from {contract.current_leverage} to {leverage}")
             contract.set_current_leverage(leverage)
+            return True
+        return False
 
     async def set_symbol_take_profit_stop_loss_mode(self, symbol, new_mode: enums.TakeProfitStopLossMode):
         """

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/exchanges/types/rest_exchange.py

@@ -102,6 +102,8 @@ class RestExchange(abstract_exchange.AbstractExchange):
     CAN_HAVE_DELAYED_CANCELLED_ORDERS = False
     # Set True when the "limit" param when fetching order books is taken into account
     SUPPORTS_CUSTOM_LIMIT_ORDER_BOOK_FETCH = False
+    # Set False when the leverage value is set via something else that a set_leverage api (from orders for example)
+    UPDATE_LEVERAGE_FROM_API = True
 
     # text content of errors due to orders not found errors
     EXCHANGE_ORDER_NOT_FOUND_ERRORS: typing.List[typing.Iterable[str]] = []
@@ -934,7 +936,10 @@ class RestExchange(abstract_exchange.AbstractExchange):
         :param leverage: the leverage
         :return: the update result
         """
-        return await self.connector.set_symbol_leverage(leverage=leverage, symbol=symbol, **kwargs)
+        if self.UPDATE_LEVERAGE_FROM_API:
+            return await self.connector.set_symbol_leverage(leverage=leverage, symbol=symbol, **kwargs)
+        # nothing to do when UPDATE_LEVERAGE_FROM_API is False
+        return None
 
     async def set_symbol_margin_type(self, symbol: str, isolated: bool, **kwargs: dict):
         """

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/modes/abstract_trading_mode.py

@@ -17,6 +17,7 @@ import abc
 import contextlib
 import decimal
 import copy
+import typing
 
 import octobot_commons.constants as common_constants
 import octobot_commons.enums as common_enums
@@ -585,6 +586,13 @@ class AbstractTradingMode(abstract_tentacle.AbstractTentacle):
             params=params
         )
 
+    async def set_leverage(
+        self, symbol: str, side: typing.Optional[enums.PositionSide], leverage: decimal.Decimal
+    ) -> bool:
+        return await signals.set_leverage(
+            self.exchange_manager, self.should_emit_trading_signal(), symbol, side, leverage
+        )
+
     async def get_additional_metadata(self, is_backtesting):
         """
         Override if necessary

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/modes/script_keywords/basic_keywords/configuration.py

@@ -42,9 +42,8 @@ async def user_select_emit_trading_signals(ctx, identifier, def_val=False) -> bo
     return is_emitting_signals
 
 
-async def set_leverage(ctx, leverage):
+async def set_leverage(ctx, leverage, side=None):
     if ctx.exchange_manager.is_future:
-        side = None
         try:
             await ctx.exchange_manager.trader.set_leverage(ctx.symbol, side, decimal.Decimal(str(leverage)))
         except errors.ContractExistsError as e:

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/personal_data/orders/order.py

@@ -532,7 +532,7 @@ class Order(util.Initializable):
         except errors.ExchangeClosedPositionError as err:
             message = (
                 f"chained order is cancelled as it can't be created: position is closed "
-                f"on exchange ({err}) order: {order.id}"
+                f"on exchange ({err}) order: {order.order_id}"
             )
             if order.reduce_only:
                 # can happen on reduce only orders

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/signals/__init__.py

@@ -40,6 +40,7 @@ from octobot_trading.signals.signal_creation import (
     create_order,
     cancel_order,
     edit_order,
+    set_leverage,
 )
 
 
@@ -57,4 +58,5 @@ __all__ = [
     "create_order",
     "cancel_order",
     "edit_order",
+    "set_leverage",
 ]

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/signals/signal_creation.py

@@ -15,10 +15,12 @@
 #  License along with this library.
 import decimal
 import contextlib
+import typing
 
 import octobot_trading.modes.script_keywords as script_keywords
 import octobot_trading.personal_data.orders as orders
 import octobot_trading.constants as constants
+import octobot_trading.enums as enums
 import octobot_trading.signals.trading_signal_bundle_builder as trading_signal_bundle_builder
 
 import octobot_commons.logging as logging
@@ -141,3 +143,15 @@ async def edit_order(
             updated_current_price=edited_current_price,
         )
     return changed
+
+
+async def set_leverage(
+    exchange_manager, should_emit_signal, symbol: str, side: typing.Optional[enums.PositionSide],
+    leverage: decimal.Decimal
+) -> bool:
+    changed = await exchange_manager.trader.set_leverage(symbol, side, leverage)
+    if should_emit_signal and changed:
+        signals.SignalPublisher.instance().get_signal_bundle_builder(symbol).add_leverage_update(
+            symbol, side, leverage, exchange_manager
+        )
+    return changed

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/signals/trading_signal_bundle_builder.py

@@ -13,6 +13,9 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
+import decimal
+import typing
+
 import octobot_commons.signals as signals
 import octobot_trading.signals.util as signal_util
 import octobot_trading.enums as trading_enums
@@ -34,10 +37,20 @@ class TradingSignalBundleBuilder(signals.SignalBundleBuilder):
 
     def sort_signals(self):
         # https://docs.python.org/3/howto/sorting.html#sort-stability-and-complex-sorts
-        # move cancelled order signals at the beginning of the list, leave others as is while keeping initial order
-        def _sort_key(signal):
-            return 0 if signal.content[trading_enums.TradingSignalCommonsAttrs.ACTION.value] == \
-                trading_enums.TradingSignalOrdersActions.CANCEL.value else 1
+        # sorting rules:
+        #   1. cancelled order signals at the beginning of the list
+        #   2. positions edit (such as changing leverage)
+        #   3. others as is while keeping initial order
+        def _sort_key(signal: signals.Signal):
+            return (
+                0 if (
+                    signal.content[trading_enums.TradingSignalCommonsAttrs.ACTION.value] ==
+                    trading_enums.TradingSignalOrdersActions.CANCEL.value
+                ) else (
+                    1 if signal.topic == trading_enums.TradingSignalTopics.POSITIONS.value
+                    else 2
+                )
+            )
 
         self.signals = sorted(self.signals, key=_sort_key)
         return self
@@ -122,6 +135,25 @@ class TradingSignalBundleBuilder(signals.SignalBundleBuilder):
                 )
             )
 
+    def add_leverage_update(
+        self, symbol: str, side: typing.Optional[trading_enums.PositionSide],
+        leverage: decimal.Decimal, exchange_manager
+    ):
+        if not self._update_pending_positions(
+            symbol, side, exchange_manager, trading_enums.TradingSignalPositionsActions.EDIT, leverage=leverage
+        ):
+            self.register_signal(
+                trading_enums.TradingSignalTopics.POSITIONS.value,
+                signal_util.create_position_signal_content(
+                    trading_enums.TradingSignalPositionsActions.EDIT,
+                    self.strategy,
+                    exchange_manager,
+                    symbol,
+                    side,
+                    leverage
+                )
+            )
+
     def _update_pending_orders(
         self, order, exchange_manager,
         action,
@@ -189,47 +221,85 @@ class TradingSignalBundleBuilder(signals.SignalBundleBuilder):
             pass
         return False
 
+    def _update_pending_positions(self, symbol, side, exchange_manager, action, leverage):
+        try:
+            _, position_description = self._get_position_description_from_local_positions(
+                symbol, side, exchange_manager.exchange_name
+            )
+            if action is trading_enums.TradingSignalPositionsActions.EDIT:
+                # update position edit content
+                position_description[trading_enums.TradingSignalPositionsAttrs.LEVERAGE.value] = float(leverage)
+            return True
+        except trading_errors.PositionDescriptionNotFoundError:
+            pass
+        return False
+
     def _pack_referenced_orders_together(self):
         filtered_signals = []
         order_description_by_seen_group_ids = {}
         for signal in self.signals:
             include_signal = True
-            try:
-                # bundled orders must be sent at the same time as the original order, add them both to the same signal
-                if add_to_order_id := signal.content[trading_enums.TradingSignalOrdersAttrs.BUNDLED_WITH.value]:
-                    _, order_description = self._get_order_description_from_local_orders(add_to_order_id)
-                    order_description[trading_enums.TradingSignalOrdersAttrs.ADDITIONAL_ORDERS.value]\
-                        .append(signal.content)
-                    include_signal = False
-                # chained orders must be sent at the same time as the original order, add them both to the same signal
-                elif add_to_order_id := signal.content[trading_enums.TradingSignalOrdersAttrs.CHAINED_TO.value]:
-                    _, order_description = self._get_order_description_from_local_orders(add_to_order_id)
-                    order_description[trading_enums.TradingSignalOrdersAttrs.ADDITIONAL_ORDERS.value]\
-                        .append(signal.content)
-                    include_signal = False
-            except trading_errors.OrderDescriptionNotFoundError:
-                # Failed to find the triggering order's associated signal that this order signal should be associated to
-                # in ADDITIONAL_ORDERS.
-                # This can happen when the triggering order has already been sent in a different signal
-                self.logger.debug(f"Skip signal packing for {signal}: triggering order not found in associated signals")
-            # grouped orders must be created before the group is enabled, add them both to the same signal
-            # groups. They might also need to be updated together
-            if (add_to_group_ids := signal.content[trading_enums.TradingSignalOrdersAttrs.GROUP_ID.value]) \
-               and include_signal:
-                if add_to_group_ids in order_description_by_seen_group_ids:
-                    order_description_by_seen_group_ids[add_to_group_ids][
-                        trading_enums.TradingSignalOrdersAttrs.ADDITIONAL_ORDERS.value].append(signal.content)
-                    include_signal = False
-                else:
-                    order_description_by_seen_group_ids[add_to_group_ids] = signal.content
+            if signal.topic == trading_enums.TradingSignalTopics.ORDERS.value:
+                try:
+                    # bundled orders must be sent at the same time as the original order, add them both to the same signal
+                    if add_to_order_id := signal.content[trading_enums.TradingSignalOrdersAttrs.BUNDLED_WITH.value]:
+                        _, order_description = self._get_order_description_from_local_orders(add_to_order_id)
+                        order_description[trading_enums.TradingSignalOrdersAttrs.ADDITIONAL_ORDERS.value]\
+                            .append(signal.content)
+                        include_signal = False
+                    # chained orders must be sent at the same time as the original order, add them both to the same signal
+                    elif add_to_order_id := signal.content[trading_enums.TradingSignalOrdersAttrs.CHAINED_TO.value]:
+                        _, order_description = self._get_order_description_from_local_orders(add_to_order_id)
+                        order_description[trading_enums.TradingSignalOrdersAttrs.ADDITIONAL_ORDERS.value]\
+                            .append(signal.content)
+                        include_signal = False
+                except trading_errors.OrderDescriptionNotFoundError:
+                    # Failed to find the triggering order's associated signal that this order signal should be associated to
+                    # in ADDITIONAL_ORDERS.
+                    # This can happen when the triggering order has already been sent in a different signal
+                    self.logger.debug(f"Skip signal packing for {signal}: triggering order not found in associated signals")
+                # grouped orders must be created before the group is enabled, add them both to the same signal
+                # groups. They might also need to be updated together
+                if (add_to_group_ids := signal.content[trading_enums.TradingSignalOrdersAttrs.GROUP_ID.value]) \
+                   and include_signal:
+                    if add_to_group_ids in order_description_by_seen_group_ids:
+                        order_description_by_seen_group_ids[add_to_group_ids][
+                            trading_enums.TradingSignalOrdersAttrs.ADDITIONAL_ORDERS.value].append(signal.content)
+                        include_signal = False
+                    else:
+                        order_description_by_seen_group_ids[add_to_group_ids] = signal.content
+            elif signal.topic == trading_enums.TradingSignalTopics.POSITIONS.value:
+                # nothing to do, signals can be added as is
+                pass
+            else:
+                include_signal = False
+                self.logger.debug(f"Skip signal packing for {signal} ({signal.topic=})")
             if include_signal:
                 filtered_signals.append(signal)
         self.signals = filtered_signals
 
     def _get_order_description_from_local_orders(self, order_id):
         for index, signal in enumerate(self.signals):
-            if signal.content[trading_enums.TradingSignalOrdersAttrs.ORDER_ID.value] == order_id:
+            if (
+                signal.topic == trading_enums.TradingSignalTopics.ORDERS.value and
+                signal.content[trading_enums.TradingSignalOrdersAttrs.ORDER_ID.value] == order_id
+            ):
                 return index, signal.content
         raise trading_errors.OrderDescriptionNotFoundError(
             f"order not found (order_id: {order_id})"
         )
+
+    def _get_position_description_from_local_positions(self, symbol, side, exchange_name):
+        for index, signal in enumerate(self.signals):
+            side_value = side.value if side else side
+            if (
+                signal.topic == trading_enums.TradingSignalTopics.POSITIONS.value and
+                signal.content[trading_enums.TradingSignalPositionsAttrs.SYMBOL.value] == symbol and
+                signal.content[trading_enums.TradingSignalPositionsAttrs.SIDE.value] == side_value and
+                signal.content[trading_enums.TradingSignalPositionsAttrs.EXCHANGE.value] == exchange_name
+            ):
+                return index, signal.content
+        raise trading_errors.PositionDescriptionNotFoundError(
+            f"position not found ({symbol, side, exchange_name})"
+        )
+

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/octobot_trading/signals/util.py

@@ -71,3 +71,18 @@ def create_order_signal_content(
             None if order.triggered_by is None else order.triggered_by.order_id,
         trading_enums.TradingSignalOrdersAttrs.ADDITIONAL_ORDERS.value: [],
     }
+
+
+def create_position_signal_content(
+    action, strategy, exchange_manager, symbol, side, leverage
+) -> dict:
+    # only use order.order_id to identify orders in signals (exchange_order_id is local and never shared)
+    return {
+        trading_enums.TradingSignalCommonsAttrs.ACTION.value: action.value,
+        trading_enums.TradingSignalPositionsAttrs.STRATEGY.value: strategy,
+        trading_enums.TradingSignalPositionsAttrs.EXCHANGE.value: exchange_manager.exchange_name,
+        trading_enums.TradingSignalPositionsAttrs.EXCHANGE_TYPE.value: exchanges.get_exchange_type(exchange_manager).value,
+        trading_enums.TradingSignalPositionsAttrs.SYMBOL.value: symbol,
+        trading_enums.TradingSignalPositionsAttrs.SIDE.value: side.value if side else side,
+        trading_enums.TradingSignalPositionsAttrs.LEVERAGE.value: float(leverage),
+    }

{OctoBot-Trading-2.4.140 → OctoBot-Trading-2.4.142}/tests/personal_data/orders/test_order.py

@@ -398,9 +398,8 @@ async def test_create_triggered_chained_order_mock(trader_simulator):
 
     base_order = personal_data.Order(trader_inst)
     eq_chained_order_1 = mock.Mock(get_name=mock.Mock(return_value="plop"))
-    chained_order_1 = mock.Mock(
-        create_triggered_equivalent_order=mock.AsyncMock(return_value=eq_chained_order_1),
-    )
+    chained_order_1 = personal_data.Order(trader_inst)
+    chained_order_1.create_triggered_equivalent_order=mock.AsyncMock(return_value=eq_chained_order_1)
 
     # normal call
     with mock.patch.object(order_util, "create_as_chained_order", mock.AsyncMock()) as create_as_chained_order_mock:
@@ -419,7 +418,7 @@ async def test_create_triggered_chained_order_mock(trader_simulator):
 
     # ExchangeClosedPositionError
     chained_order_1.status = None
-    chained_order_1.state = 1
+    chained_order_1.state = mock.Mock()
     with mock.patch.object(
         order_util, "create_as_chained_order", mock.AsyncMock(side_effect=errors.ExchangeClosedPositionError)
     ) as create_as_chained_order_mock:
@@ -440,7 +439,7 @@ async def test_create_triggered_chained_order_mock(trader_simulator):
         return
 
     chained_order_1.status = 1
-    chained_order_1.state = 1
+    chained_order_1.state = mock.Mock()
     with mock.patch.object(
         order_util, "create_as_chained_order", mock.AsyncMock(side_effect=_create_as_chained_order)
     ) as create_as_chained_order_mock, mock.patch.object(