OctoBot-Trading 2.4.209__tar.gz → 2.4.210__tar.gz

{OctoBot-Trading-2.4.209 → OctoBot-Trading-2.4.210}/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.210] - 2025-08-22
+### Added
+[TradingModes] add get_trading_modes_of_this_type_on_this_matrix
+### Updated
+[Orders] handle get_computed_fee on cleared orders
+[Keywords] make price and amount parsing errors more detailed
+
 ## [2.4.209] - 2025-08-21
 ### Updated
 [Portfolio] consider order fees in delta when from exchange

{OctoBot-Trading-2.4.209 → OctoBot-Trading-2.4.210/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.209 → OctoBot-Trading-2.4.210}/octobot_trading/modes/__init__.py

@@ -72,6 +72,7 @@ from octobot_trading.modes.modes_util import (
     get_instantly_filled_limit_order_adapted_price,
     get_instantly_filled_limit_order_adapted_price_and_quantity,
     notify_portfolio_optimization_complete,
+    get_trading_modes_of_this_type_on_this_matrix,
 )
 
 __all__ = [
@@ -102,4 +103,5 @@ __all__ = [
     "get_instantly_filled_limit_order_adapted_price",
     "get_instantly_filled_limit_order_adapted_price_and_quantity",
     "notify_portfolio_optimization_complete",
+    "get_trading_modes_of_this_type_on_this_matrix",
 ]

{OctoBot-Trading-2.4.209 → OctoBot-Trading-2.4.210}/octobot_trading/modes/modes_util.py

@@ -247,3 +247,18 @@ async def notify_portfolio_optimization_complete():
         )
     except ImportError as e:
         logging.get_logger(__name__).exception(e, True, f"Impossible to send notification: {e}")
+
+
+def get_trading_modes_of_this_type_on_this_matrix(trading_mode) -> list:
+    import octobot_trading.api  # avoid circular import issues
+    other_trading_modes = []
+    for exchange_id in octobot_trading.api.get_all_exchange_ids_with_same_matrix_id(
+        trading_mode.exchange_manager.exchange_name, trading_mode.exchange_manager.id
+    ):
+        exchange_manager = octobot_trading.api.get_exchange_manager_from_exchange_id(exchange_id)
+        other_trading_modes.extend(
+            other_trading_mode
+            for other_trading_mode in exchange_manager.trading_modes
+            if isinstance(other_trading_mode, type(trading_mode))
+        )
+    return other_trading_modes

{OctoBot-Trading-2.4.209 → OctoBot-Trading-2.4.210}/octobot_trading/modes/script_keywords/basic_keywords/amount.py

@@ -37,7 +37,7 @@ async def get_amount_from_input_amount(
     amount_type, amount_value = dsl.parse_quantity(input_amount)
 
     if amount_type is dsl.QuantityType.UNKNOWN or amount_value is None or amount_value <= 0:
-        raise trading_errors.InvalidArgumentError("Amount cant be zero, None or negative (amount: {amount_value})")
+        raise trading_errors.InvalidArgumentError(f"Amount cant be zero, None or negative (amount: {amount_value}, input: {input_amount})")
 
     if amount_type in (dsl.QuantityType.DELTA, dsl.QuantityType.DELTA_BASE):
         # nothing to do

{OctoBot-Trading-2.4.209 → OctoBot-Trading-2.4.210}/octobot_trading/modes/script_keywords/basic_keywords/price.py

@@ -26,7 +26,7 @@ async def get_price_with_offset(context, offset_input, use_delta_type_as_flat_va
     offset_type, offset_value = dsl.parse_quantity(offset_input)
 
     if offset_value is None:
-        raise errors.InvalidArgumentError("offset_value can't be None")
+        raise errors.InvalidArgumentError(f"Invalid price: parsed value can't be None (input: {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

{OctoBot-Trading-2.4.209 → OctoBot-Trading-2.4.210}/octobot_trading/personal_data/orders/order.py

@@ -17,6 +17,7 @@ import asyncio
 import typing
 import contextlib
 import decimal
+import copy
 
 import octobot_commons.logging as logging
 
@@ -797,6 +798,9 @@ class Order(util.Initializable):
         # consider worse case taker fees when using use_origin_quantity_and_price as the order is not filled yet
         taker_or_maker = enums.ExchangeConstantsOrderColumns.TAKER.value \
             if use_origin_quantity_and_price else self.taker_or_maker
+        if self.is_cleared():
+            # order is cleared, it might have been filled or cancelled. Use existing fees
+            return copy.copy(self.fee)
         if self.fees_currency_side is enums.FeesCurrencySide.UNDEFINED:
             computed_fee = self.exchange_manager.exchange.get_trade_fee(
                 self.symbol, self.order_type, quantity, price, taker_or_maker