OctoBot-Trading 2.4.60__tar.gz → 2.4.62__tar.gz

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/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.62] - 2024-03-15
+### Added
+- [ScriptingKeywords] price offsets
+
+## [2.4.61] - 2024-03-12
+### Fixed
+- [Orders] chained orders quantity after fees decimals
+
 ## [2.4.60] - 2024-03-12
 ### Updated
 - [TradingModes] add exchange order ids to cancel_symbol_open_orders

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -139,6 +139,8 @@ octobot_trading/modes/script_keywords/basic_keywords/__init__.py
 octobot_trading/modes/script_keywords/basic_keywords/account_balance.py
 octobot_trading/modes/script_keywords/basic_keywords/amount.py
 octobot_trading/modes/script_keywords/basic_keywords/configuration.py
+octobot_trading/modes/script_keywords/basic_keywords/position.py
+octobot_trading/modes/script_keywords/basic_keywords/price.py
 octobot_trading/modes/script_keywords/basic_keywords/run_persistence.py
 octobot_trading/modes/script_keywords/basic_keywords/trading_signals.py
 octobot_trading/modes/script_keywords/basic_keywords/user_inputs.py
@@ -349,6 +351,8 @@ tests/modes/script_keywords/__init__.py
 tests/modes/script_keywords/basic_keywords/__init__.py
 tests/modes/script_keywords/basic_keywords/test_account_balance.py
 tests/modes/script_keywords/basic_keywords/test_amount.py
+tests/modes/script_keywords/basic_keywords/test_position.py
+tests/modes/script_keywords/basic_keywords/test_price.py
 tests/modes/script_keywords/dsl/__init__.py
 tests/modes/script_keywords/dsl/test_quantity.py
 tests/personal_data/__init__.py

{OctoBot-Trading-2.4.60/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.62}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/octobot_trading/modes/script_keywords/__init__.py

@@ -35,6 +35,10 @@ from octobot_trading.modes.script_keywords.basic_keywords import (
     set_leverage,
     set_partial_take_profit_stop_loss,
     get_amount_from_input_amount,
+    get_price_with_offset,
+    get_position,
+    average_open_pos_entry,
+    is_in_one_way_position_mode,
     total_account_balance,
     available_account_balance,
     adapt_amount_to_holdings,
@@ -67,6 +71,10 @@ __all__ = [
     "set_leverage",
     "set_partial_take_profit_stop_loss",
     "get_amount_from_input_amount",
+    "get_price_with_offset",
+    "get_position",
+    "average_open_pos_entry",
+    "is_in_one_way_position_mode",
     "total_account_balance",
     "available_account_balance",
     "adapt_amount_to_holdings",

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/octobot_trading/modes/script_keywords/basic_keywords/__init__.py

@@ -36,6 +36,16 @@ from octobot_trading.modes.script_keywords.basic_keywords.amount import (
     get_amount_from_input_amount,
 )
 
+from octobot_trading.modes.script_keywords.basic_keywords.price import (
+    get_price_with_offset,
+)
+
+from octobot_trading.modes.script_keywords.basic_keywords.position import (
+    get_position,
+    average_open_pos_entry,
+    is_in_one_way_position_mode,
+)
+
 from octobot_trading.modes.script_keywords.basic_keywords.account_balance import (
     total_account_balance,
     available_account_balance,
@@ -71,6 +81,10 @@ __all__ = [
     "set_leverage",
     "set_partial_take_profit_stop_loss",
     "get_amount_from_input_amount",
+    "get_price_with_offset",
+    "get_position",
+    "average_open_pos_entry",
+    "is_in_one_way_position_mode",
     "total_account_balance",
     "available_account_balance",
     "adapt_amount_to_holdings",

OctoBot-Trading-2.4.62/octobot_trading/modes/script_keywords/basic_keywords/position.py

@@ -0,0 +1,58 @@
+#  Drakkar-Software OctoBot-Trading
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+
+import octobot_trading.constants as trading_constants
+import octobot_trading.enums as trading_enums
+import octobot_trading.errors as trading_errors
+
+
+def get_position(context, symbol=None, side=trading_enums.PositionSide.BOTH.value):
+    return context.exchange_manager.exchange_personal_data.positions_manager.get_symbol_position(
+        symbol or context.symbol,
+        _get_position_side(context, side)
+    )
+
+
+async def average_open_pos_entry(context, side=trading_enums.PositionSide.LONG.value):
+    if context.exchange_manager.is_future:
+        return get_position(context, context.symbol, side).entry_price
+    elif context.exchange_manager.is_margin:
+        return trading_constants.ZERO
+    else:
+        return trading_constants.ZERO
+
+
+def _get_position_side(ctx, side):
+    if is_in_one_way_position_mode(ctx):
+        return trading_enums.PositionSide.BOTH
+
+    # hedge mode
+    if side == trading_enums.PositionSide.LONG.value:
+        return trading_enums.PositionSide.LONG
+    elif side == trading_enums.PositionSide.SHORT.value:
+        return trading_enums.PositionSide.SHORT
+    elif side == trading_enums.PositionSide.BOTH.value:
+        raise trading_errors.InvalidArgumentError(
+            "average_open_pos_entry: both sides are not implemented yet for hedged mode"
+        )
+    else:
+        raise trading_errors.InvalidArgumentError(
+            'average_open_pos_entry: side needs to be "long", "short" or "both"'
+        )
+
+
+def is_in_one_way_position_mode(ctx):
+    return ctx.exchange_manager.exchange.get_pair_future_contract(ctx.symbol).is_one_way_position_mode()

OctoBot-Trading-2.4.62/octobot_trading/modes/script_keywords/basic_keywords/price.py

@@ -0,0 +1,64 @@
+#  Drakkar-Software OctoBot-Trading
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import octobot_trading.errors as errors
+import octobot_trading.constants as constants
+import octobot_trading.personal_data as personal_data
+import octobot_trading.modes.script_keywords.dsl as dsl
+import octobot_trading.modes.script_keywords.basic_keywords.position as position
+
+
+async def get_price_with_offset(context, offset_input, use_delta_type_as_flat_value=False, side=None):
+    if offset_input is None:
+        raise errors.InvalidArgumentError("price or offset is required")
+    offset_type, offset_value = dsl.parse_quantity(offset_input)
+
+    # when use_delta_type_as_flat_value is True, consider a simple price input as a flat target instead of an offset
+    is_delta_type_considered_as_flat = offset_type is dsl.QuantityType.DELTA and use_delta_type_as_flat_value
+
+    if offset_type is dsl.QuantityType.DELTA_EXPLICIT or (
+        offset_type is dsl.QuantityType.DELTA and not is_delta_type_considered_as_flat
+    ):
+        current_price_val = await personal_data.get_up_to_date_price(
+            context.exchange_manager, context.symbol, timeout=constants.ORDER_DATA_FETCHING_TIMEOUT
+        )
+        # offset should be negative when wanting to buy bellow current price
+        computed_price = current_price_val + offset_value
+
+    elif offset_type is dsl.QuantityType.PERCENT:
+        current_price_val = await personal_data.get_up_to_date_price(
+            context.exchange_manager, context.symbol, timeout=constants.ORDER_DATA_FETCHING_TIMEOUT
+        )
+        computed_price = current_price_val * (constants.ONE + (offset_value / constants.ONE_HUNDRED))
+
+    elif offset_type is dsl.QuantityType.ENTRY_PERCENT:
+        average_open_pos_entry_val = await position.average_open_pos_entry(context, side)
+        computed_price = average_open_pos_entry_val * (constants.ONE + (offset_value / constants.ONE_HUNDRED))
+
+    elif offset_type is dsl.QuantityType.ENTRY:
+        average_open_pos_entry_val = await position.average_open_pos_entry(context, side)
+        computed_price = average_open_pos_entry_val + offset_value
+
+    elif is_delta_type_considered_as_flat or offset_type is dsl.QuantityType.FLAT:
+        computed_price = offset_value
+    else:
+        raise errors.InvalidArgumentError(
+            f"'{offset_input}' is not supported. "
+            f"Make sure to use a supported syntax for price, supported parameters are: "
+            f"1.2, -0.222, -0.222d, @65100, 5%, e5%, e500"
+        )
+
+    symbol_market = context.exchange_manager.exchange.get_market_status(context.symbol, with_fixer=False)
+    return personal_data.decimal_adapt_price(symbol_market, computed_price)

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/octobot_trading/modes/script_keywords/dsl/values.py

@@ -19,6 +19,7 @@ import enum
 
 class QuantityType(enum.Enum):
     DELTA = ""
+    DELTA_EXPLICIT = "d"
     DELTA_QUOTE = "q"
     DELTA_BASE = "b"
     PERCENT = "%"

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/octobot_trading/personal_data/orders/channel/orders.py

@@ -29,7 +29,7 @@ class OrdersProducer(exchanges_channel.ExchangeChannelProducer):
 
     async def perform(self, orders, is_from_bot=False, are_closed=False):
         try:
-            self.logger.debug(f"Received order update for {len(orders)} orders.")
+            self.logger.debug(f"Received order update for {len(orders)} {'closed' if are_closed else ''} orders.")
             has_new_order = False
             waiting_complete_init_orders = []
             symbols = set()

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/octobot_trading/personal_data/orders/order.py

@@ -25,6 +25,7 @@ import octobot_trading.enums as enums
 import octobot_trading.errors as errors
 import octobot_trading.personal_data.orders.states as orders_states
 import octobot_trading.personal_data.orders.order_util as order_util
+import octobot_trading.personal_data.orders.decimal_order_adapter as decimal_order_adapter
 import octobot_trading.util as util
 
 
@@ -476,11 +477,15 @@ class Order(util.Initializable):
             logger = logging.get_logger(self.get_logger_name())
             fees_str = f"Paid {self.quantity_currency} fees: {relevant_fees_amount}, " \
                        f"initial order size: {self.origin_quantity}"
-            if relevant_fees_amount > self.origin_quantity:
+            if relevant_fees_amount >= self.origin_quantity:
                 logger.error(f"Impossible to update chained order amount according to triggering order fees: "
                              f"fees are larger than then chained order size. {fees_str}")
                 return False
-            self.origin_quantity -= relevant_fees_amount
+            self.origin_quantity = decimal_order_adapter.decimal_adapt_quantity(
+                self.exchange_manager.exchange.get_market_status(self.symbol, with_fixer=False),
+                self.origin_quantity - relevant_fees_amount
+            )
+            fees_str = f"{fees_str}, updated size: {self.origin_quantity}"
             logger.debug(f"Updating chained order quantity with triggering order fees. {fees_str}")
         return True
 

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/tests/modes/script_keywords/__init__.py

@@ -64,6 +64,7 @@ async def mock_context(backtesting_trader):
         mock.Mock(),
     )
     context.signal_builder = mock.Mock()
+    context.is_trading_signal_emitter = mock.Mock(return_value=False)
     context.orders_writer = mock.Mock(log_many=mock.AsyncMock())
     portfolio_manager = exchange_manager.exchange_personal_data.portfolio_manager
     # init portfolio with 0.5 BTC, 20 ETH and 30000 USDT and only 0.1 available BTC

OctoBot-Trading-2.4.62/tests/modes/script_keywords/basic_keywords/test_position.py

@@ -0,0 +1,53 @@
+#  Drakkar-Software OctoBot-Trading
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import pytest
+import mock
+import decimal
+
+import octobot_trading.modes.script_keywords as script_keywords
+import octobot_trading.modes.script_keywords.basic_keywords.position as position
+import octobot_trading.enums as enums
+import octobot_trading.constants as constants
+
+from tests import event_loop
+from tests.modes.script_keywords import mock_context
+from tests.exchanges import backtesting_trader, \
+    backtesting_config, backtesting_exchange_manager, fake_backtesting
+
+
+# All test coroutines will be treated as marked.
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize("backtesting_config", ["USDT"], indirect=["backtesting_config"])
+async def test_average_open_pos_entry(mock_context):
+    mock_context.exchange_manager.is_future = False
+    with mock.patch.object(position, "get_position",
+                           mock.Mock(return_value=(mock.Mock(entry_price=decimal.Decimal("40000"))))) \
+         as get_position_mock:
+        mock_context.symbol = "ETH/USDT"
+        assert await script_keywords.average_open_pos_entry(mock_context, enums.TradeOrderSide.BUY.value) == \
+               constants.ZERO
+        mock_context.exchange_manager.is_future = True
+        mock_context.symbol = "ETH/USDT"
+        assert await script_keywords.average_open_pos_entry(mock_context, enums.TradeOrderSide.BUY.value) == \
+               decimal.Decimal("40000")
+        get_position_mock.assert_called_once_with(mock_context, "ETH/USDT", enums.TradeOrderSide.BUY.value)
+        get_position_mock.reset_mock()
+        mock_context.symbol = "BTC/USDT"
+        assert await script_keywords.average_open_pos_entry(mock_context, enums.TradeOrderSide.BUY.value) == \
+               decimal.Decimal("40000")
+        get_position_mock.assert_called_once_with(mock_context, "BTC/USDT", enums.TradeOrderSide.BUY.value)

OctoBot-Trading-2.4.62/tests/modes/script_keywords/basic_keywords/test_price.py

@@ -0,0 +1,135 @@
+#  Drakkar-Software OctoBot-Trading
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import pytest
+import mock
+import decimal
+
+import octobot_trading.modes.script_keywords as script_keywords
+import octobot_trading.modes.script_keywords.dsl as dsl
+import octobot_trading.modes.script_keywords.basic_keywords.position as position
+import octobot_trading.personal_data as personal_data
+import octobot_trading.errors as errors
+import octobot_trading.constants as constants
+from octobot_trading.enums import ExchangeConstantsMarketStatusColumns as Ecmsc
+
+from tests import event_loop
+from tests.modes.script_keywords import null_context
+
+# All test coroutines will be treated as marked.
+pytestmark = pytest.mark.asyncio
+
+
+async def test_get_price_with_offset(null_context):
+    null_context.symbol = "blop/plop"
+    null_context.exchange_manager = mock.Mock(
+        exchange=mock.Mock(
+            get_market_status=mock.Mock(return_value={
+                Ecmsc.PRECISION.value: {
+                    Ecmsc.PRECISION_PRICE.value: 2
+                }
+            })
+        )
+    )
+
+    with pytest.raises(errors.InvalidArgumentError):
+        await script_keywords.get_price_with_offset(null_context, "1sdsqdq")
+
+    with mock.patch.object(personal_data, "get_up_to_date_price", mock.AsyncMock(return_value=200)) \
+            as current_price_mock:
+        with mock.patch.object(dsl, "parse_quantity",
+                               mock.Mock(return_value=(script_keywords.QuantityType.DELTA, decimal.Decimal(10)))) \
+                as parse_quantity_mock:
+            assert await script_keywords.get_price_with_offset(null_context, 10) == decimal.Decimal(210)
+            current_price_mock.assert_called_once_with(
+                null_context.exchange_manager, null_context.symbol, timeout=constants.ORDER_DATA_FETCHING_TIMEOUT
+            )
+            parse_quantity_mock.assert_called_once_with(10)
+            null_context.exchange_manager.exchange.get_market_status.assert_called_once_with(
+                "blop/plop", with_fixer=False
+            )
+            current_price_mock.reset_mock()
+            parse_quantity_mock.reset_mock()
+
+            assert await script_keywords.get_price_with_offset(null_context, 10, use_delta_type_as_flat_value=True) \
+                   == decimal.Decimal(10)
+            current_price_mock.assert_not_called()
+            parse_quantity_mock.assert_called_once_with(10)
+            current_price_mock.reset_mock()
+            parse_quantity_mock.reset_mock()
+
+        with mock.patch.object(dsl, "parse_quantity",
+                               mock.Mock(return_value=(script_keywords.QuantityType.DELTA_EXPLICIT, decimal.Decimal(10)))) \
+                as parse_quantity_mock:
+            assert await script_keywords.get_price_with_offset(null_context, 10) == decimal.Decimal(210)
+            current_price_mock.assert_called_once_with(
+                null_context.exchange_manager, null_context.symbol, timeout=constants.ORDER_DATA_FETCHING_TIMEOUT
+            )
+            parse_quantity_mock.assert_called_once_with(10)
+            current_price_mock.reset_mock()
+            parse_quantity_mock.reset_mock()
+
+            # DELTA_EXPLICIT ignores use_delta_type_as_flat_value
+            assert await script_keywords.get_price_with_offset(null_context, 10, use_delta_type_as_flat_value=True) \
+                   == decimal.Decimal(210)
+            current_price_mock.assert_called_once_with(
+                null_context.exchange_manager, null_context.symbol, timeout=constants.ORDER_DATA_FETCHING_TIMEOUT
+            )
+            parse_quantity_mock.assert_called_once_with(10)
+            current_price_mock.reset_mock()
+            parse_quantity_mock.reset_mock()
+
+        with mock.patch.object(
+            dsl, "parse_quantity",
+            mock.Mock(return_value=(script_keywords.QuantityType.DELTA, decimal.Decimal("10.333333")))
+        ) as parse_quantity_mock:
+            assert await script_keywords.get_price_with_offset(
+                null_context, 10.333333, use_delta_type_as_flat_value=True
+            ) == decimal.Decimal("10.33")   # rounded according to precision
+            current_price_mock.assert_not_called()
+            parse_quantity_mock.assert_called_once_with(10.333333)
+            current_price_mock.reset_mock()
+            parse_quantity_mock.reset_mock()
+
+        with mock.patch.object(dsl, "parse_quantity",
+                               mock.Mock(return_value=(script_keywords.QuantityType.PERCENT, decimal.Decimal(-99)))):
+            assert await script_keywords.get_price_with_offset(null_context, 10) == decimal.Decimal(2)
+
+        with mock.patch.object(dsl, "parse_quantity",
+                               mock.Mock(return_value=(script_keywords.QuantityType.PERCENT, decimal.Decimal(1000)))):
+            assert await script_keywords.get_price_with_offset(null_context, 10) == decimal.Decimal(2200)
+
+    with mock.patch.object(position, "average_open_pos_entry", mock.AsyncMock(return_value=500)) \
+            as average_open_pos_entry_mock:
+        with mock.patch.object(dsl, "parse_quantity",
+                               mock.Mock(return_value=(script_keywords.QuantityType.ENTRY_PERCENT, decimal.Decimal(-50)))):
+            assert await script_keywords.get_price_with_offset(null_context, 10, side="sell") == decimal.Decimal(250)
+            average_open_pos_entry_mock.assert_called_once_with(null_context, "sell")
+
+    with mock.patch.object(position, "average_open_pos_entry", mock.AsyncMock(return_value=500)) \
+            as average_open_pos_entry_mock:
+        with mock.patch.object(dsl, "parse_quantity",
+                               mock.Mock(return_value=(script_keywords.QuantityType.ENTRY, decimal.Decimal(50)))):
+            assert await script_keywords.get_price_with_offset(null_context, 10, side="sell") == decimal.Decimal(550)
+            average_open_pos_entry_mock.assert_called_once()
+
+    with mock.patch.object(dsl, "parse_quantity",
+                           mock.Mock(return_value=(script_keywords.QuantityType.FLAT, decimal.Decimal(50)))):
+        assert await script_keywords.get_price_with_offset(null_context, 10) == decimal.Decimal(50)
+
+    with mock.patch.object(dsl, "parse_quantity",
+                           mock.Mock(return_value=(script_keywords.QuantityType.UNKNOWN, decimal.Decimal(-50)))):
+        with pytest.raises(errors.InvalidArgumentError):
+            await script_keywords.get_price_with_offset(null_context, 10)

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/tests/modes/script_keywords/dsl/test_quantity.py

@@ -27,6 +27,12 @@ def test_parse_quantity_types():
     assert script_keywords.parse_quantity(1.366666663347877) == \
            (script_keywords.QuantityType.DELTA, decimal.Decimal("1.366666663347877"))
     assert script_keywords.parse_quantity("-10") == (script_keywords.QuantityType.DELTA, decimal.Decimal(-10))
+
+    assert script_keywords.parse_quantity("-10d") == (script_keywords.QuantityType.DELTA_EXPLICIT, decimal.Decimal(-10))
+    assert script_keywords.parse_quantity("d-10") == (script_keywords.QuantityType.DELTA_EXPLICIT, decimal.Decimal(-10))
+    assert script_keywords.parse_quantity("d+10") == (script_keywords.QuantityType.DELTA_EXPLICIT, decimal.Decimal(10))
+    assert script_keywords.parse_quantity("d10") == (script_keywords.QuantityType.DELTA_EXPLICIT, decimal.Decimal(10))
+
     assert script_keywords.parse_quantity("-10b") == (script_keywords.QuantityType.DELTA_BASE, decimal.Decimal(-10))
 
     assert script_keywords.parse_quantity("q") == (script_keywords.QuantityType.DELTA_QUOTE, None)

{OctoBot-Trading-2.4.60 → OctoBot-Trading-2.4.62}/tests/personal_data/orders/test_order.py

@@ -339,6 +339,63 @@ async def test_trigger_chained_orders(trader_simulator):
         create_as_chained_order_mock.assert_called_once_with(order_mock_1)
 
 
+def test_update_quantity_with_order_fees(trader_simulator):
+    config, exchange_manager_inst, trader_inst = trader_simulator
+
+    base_order = personal_data.Order(trader_inst)
+    base_order.symbol = "BTC/USDT"
+
+    other_order = personal_data.Order(trader_inst)
+    other_order.symbol = base_order.symbol
+    other_order.origin_quantity = decimal.Decimal(1)
+
+    # case 1: quantity_currency is not the amount unit: nothing changes
+    base_order.fee = {
+        enums.FeePropertyColumns.CURRENCY.value: "USDT",
+        enums.FeePropertyColumns.COST.value: decimal.Decimal("1")
+    }
+    other_order.quantity_currency = "BTC"
+    assert other_order.update_quantity_with_order_fees(base_order) is True
+    assert other_order.origin_quantity == decimal.Decimal(1)    # nothing changed
+
+    # case 2: quantity_currency is the amount unit: other_order quantity is reduced
+    base_order.fee = {
+        enums.FeePropertyColumns.CURRENCY.value: "BTC",
+        enums.FeePropertyColumns.COST.value: decimal.Decimal("0.1")
+    }
+    other_order.quantity_currency = "BTC"
+    assert other_order.update_quantity_with_order_fees(base_order) is True
+    assert other_order.origin_quantity == decimal.Decimal("0.9")    # 1 - 0.1
+    other_order.origin_quantity = decimal.Decimal(1)
+
+    # case 3: quantity_currency is the amount unit and is too large: return False
+    base_order.fee = {
+        enums.FeePropertyColumns.CURRENCY.value: "BTC",
+        enums.FeePropertyColumns.COST.value: decimal.Decimal("1")
+    }
+    other_order.quantity_currency = "BTC"
+    assert other_order.update_quantity_with_order_fees(base_order) is False
+    assert other_order.origin_quantity == decimal.Decimal(1)    # nothing changed
+    base_order.fee = {
+        enums.FeePropertyColumns.CURRENCY.value: "BTC",
+        enums.FeePropertyColumns.COST.value: decimal.Decimal("1.1")
+    }
+    other_order.quantity_currency = "BTC"
+    assert other_order.update_quantity_with_order_fees(base_order) is False
+    assert other_order.origin_quantity == decimal.Decimal(1)    # nothing changed
+
+    # case 4: quantity_currency is the amount unit: other_order quantity is reduced and adapted
+    base_order.fee = {
+        enums.FeePropertyColumns.CURRENCY.value: "BTC",
+        enums.FeePropertyColumns.COST.value: decimal.Decimal("0.111111111111111111111111")
+    }
+    other_order.quantity_currency = "BTC"
+    assert other_order.update_quantity_with_order_fees(base_order) is True
+    # 1 - 0.111111111111111111111111 with truncated digits
+    assert other_order.origin_quantity == decimal.Decimal("0.88888")
+    other_order.origin_quantity = decimal.Decimal(1)
+
+
 async def test_update_from_order(trader_simulator):
     config, exchange_manager_inst, trader_inst = trader_simulator