OctoBot-Trading 2.4.201__tar.gz → 2.4.203__tar.gz

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.203] - 2025-08-03
+### Updated
+[Trades] log parsing error
+
+## [2.4.202] - 2025-08-01
+### Added
+[Exchange] add skipped_create_order_retry context manager
+### Updated
+[Exchange] instant retry order creation on bad gateway
+### Fixed
+[Keywords] handle None amount and price error
+
 ## [2.4.201] - 2025-07-15
 ### Added
 [Exchange] MarketClosedError

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/octobot_trading/constants.py

@@ -173,7 +173,7 @@ DEFAULT_SYMBOL_POSITION_MODE = enums.PositionMode.ONE_WAY
 DEFAULT_SYMBOL_FUNDING_RATE = decimal.Decimal("0.00005")
 DEFAULT_SYMBOL_MAINTENANCE_MARGIN_RATE = decimal.Decimal("0.01")
 RETRIABLE_EXCHANGE_ERRORS_DESC: set[str] = set(os.getenv(
-    "RETRIABLE_EXCHANGE_ERRORS_DESC", 'Internal Server Error'
+    "RETRIABLE_EXCHANGE_ERRORS_DESC", 'Internal Server Error:Bad gateway'
 ).split(":"))
 
 # exchange proxy

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/octobot_trading/exchanges/abstract_exchange.py

@@ -94,9 +94,10 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
         self.allowed_time_lag = octobot_trading.constants.DEFAULT_EXCHANGE_TIME_LAG
         self.current_account = enums.AccountTypes.CASH
 
-        self.is_unreachable = False
+        self.is_unreachable: bool = False
 
         self._creating_exchange_order_descriptions = set()
+        self._enable_create_order_retrier: bool = True
 
         if exchange_config_by_exchange and self.get_name() in exchange_config_by_exchange:
             self.tentacle_config = exchange_config_by_exchange[self.get_name()]
@@ -724,7 +725,8 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
     def log_order_creation_error(self, error, order_type, symbol, quantity, price, stop_price):
         order_desc = f"order_type: {order_type}, symbol: {symbol}, quantity: {str(quantity)}, price: {str(price)}," \
                      f" stop_price: {str(stop_price)}"
-        self.logger.error(
+        log_func = self.logger.error if self._enable_create_order_retrier else self.logger.warning
+        log_func(
             f"Failed to create order : {error.__class__.__name__} {html_util.get_html_summary_if_relevant(error)}: "
             f"({order_desc})"
         )
@@ -733,6 +735,15 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
         self.logger.error(f"Exchange configuration is invalid : please check your configuration ! "
                           f"({error.__class__.__name__}: {html_util.get_html_summary_if_relevant(error)})")
 
+    @contextlib.contextmanager
+    def skipped_create_order_retry(self):
+        previous_enable_create_order_retrier = self._enable_create_order_retrier
+        try:
+            self._enable_create_order_retrier = False
+            yield
+        finally:
+            self._enable_create_order_retrier = previous_enable_create_order_retrier
+
     @contextlib.contextmanager
     def creating_order(
         self, side: enums.TradeOrderSide, symbol: str, quantity: decimal.Decimal, price: decimal.Decimal

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/octobot_trading/exchanges/types/rest_exchange.py

@@ -373,6 +373,25 @@ class RestExchange(abstract_exchange.AbstractExchange):
                 ) from err
             # otherwise propagate exception: this is not a situation to retry
             raise
+        except ccxt.ExchangeNotAvailable as err:
+            if not self._enable_create_order_retrier:
+                # should not retry, raise
+                raise
+            is_retriable_error = False
+            for error_message in constants.RETRIABLE_EXCHANGE_ERRORS_DESC:
+                if error_message in str(err):
+                    is_retriable_error = True
+            if is_retriable_error:
+                self.logger.warning(
+                    f"Failed to create order ({html_util.get_html_summary_if_relevant(err)}) : "
+                    f"order_type: {order_type}, symbol: {symbol}. Retrying order creation."
+                )
+                return await self._create_specific_order(order_type, symbol, quantity, price=price,
+                                                         stop_price=stop_price, side=side,
+                                                         current_price=current_price, reduce_only=reduce_only,
+                                                         params=params)
+            # not retriable, raise
+            raise
         except (ccxt.InvalidOrder, ccxt.BadRequest) as err:
             if self.is_exchange_account_traded_symbol_permission_error(err):
                 # exchange won't let this order create: raise
@@ -388,13 +407,18 @@ class RestExchange(abstract_exchange.AbstractExchange):
                 ) from err
             if self.is_missing_funds_error(err):
                 self._on_missing_funds_err(err, order_type, symbol, quantity, price, stop_price)
+            if not self._enable_create_order_retrier:
+                # should not retry, raise
+                raise
             # can be raised when exchange precision/limits rules change
             self.logger.warning(
                 f"Failed to create order ({html_util.get_html_summary_if_relevant(err)}) : "
                 f"order_type: {order_type}, symbol: {symbol}. "
                 f"This might be due to an update on {self.name} market rules. Fetching updated rules."
             )
-            await self.connector.load_symbol_markets(reload=True, market_filter=self.exchange_manager.market_filter)
+            await self.connector.load_symbol_markets(
+                reload=True, market_filter=self.exchange_manager.market_filter
+            )
             # retry order creation with updated markets (ccxt will use the updated market values)
             return await self._create_specific_order(order_type, symbol, quantity, price=price,
                                                      stop_price=stop_price, side=side,

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/octobot_trading/modes/script_keywords/basic_keywords/amount.py

@@ -36,8 +36,8 @@ 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 <= 0:
-        raise trading_errors.InvalidArgumentError("Amount cant be zero or negative (amount: {amount_value})")
+    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})")
 
     if amount_type in (dsl.QuantityType.DELTA, dsl.QuantityType.DELTA_BASE):
         # nothing to do

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/octobot_trading/modes/script_keywords/basic_keywords/price.py

@@ -25,6 +25,9 @@ async def get_price_with_offset(context, offset_input, use_delta_type_as_flat_va
         raise errors.InvalidArgumentError("price or offset is required")
     offset_type, offset_value = dsl.parse_quantity(offset_input)
 
+    if offset_value is None:
+        raise errors.InvalidArgumentError("offset_value can't be None")
+
     # 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.201 → OctoBot-Trading-2.4.203}/octobot_trading/personal_data/trades/trade_factory.py

@@ -21,13 +21,9 @@ import octobot_trading.constants as constants
 
 
 def create_trade_instance_from_raw(trader, raw_trade):
-    try:
-        order = create_closed_order_instance_from_raw_trade(trader, raw_trade)
-        exchange_trade_id = raw_trade.get(enums.ExchangeConstantsOrderColumns.EXCHANGE_TRADE_ID.value)
-        return create_trade_from_order(order, exchange_trade_id=exchange_trade_id)
-    except KeyError:
-        # Funding trade candidate
-        return None
+    order = create_closed_order_instance_from_raw_trade(trader, raw_trade)
+    exchange_trade_id = raw_trade.get(enums.ExchangeConstantsOrderColumns.EXCHANGE_TRADE_ID.value)
+    return create_trade_from_order(order, exchange_trade_id=exchange_trade_id)
 
 
 def create_closed_order_instance_from_raw_trade(trader, raw_trade):

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/octobot_trading/personal_data/trades/trades_manager.py

@@ -52,12 +52,17 @@ class TradesManager(util.Initializable):
 
     def upsert_trade(self, trade_id: str, raw_trade: dict) -> bool:
         if trade_id not in self.trades:
-            created_trade = personal_data.create_trade_instance_from_raw(self.trader, raw_trade)
-            if created_trade:
+            try:
+                created_trade = personal_data.create_trade_instance_from_raw(self.trader, raw_trade)
                 if trade_id in self.trades:
                     self.logger.debug(f"Replacement of an existing trade: {self.trades[trade_id].to_dict()} "
-                                      f"by {created_trade.to_dict()} on id: {trade_id}")
+                                    f"by {created_trade.to_dict()} on id: {trade_id}")
                 return self._add_trade_if_relevant(trade_id, created_trade)
+            except Exception as err:
+                message = f"Unexpected error when parsing [{self.trader.exchange_manager.exchange_name}] trade"
+                # don't spam with errors, only log warnings
+                self.logger.warning(message)
+                self.logger.exception(err, False, message)
         return False
 
     def upsert_trade_instance(self, trade):

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/octobot_trading/util/test_tools/exchanges_test_tools.py

@@ -286,10 +286,18 @@ async def get_cancelled_orders(
 )
 async def _get_trades(exchange_manager, symbol: str, trades: list):
     row_trades = await exchange_manager.exchange.get_my_recent_trades(symbol=symbol)
-    trades.extend(
-        personal_data.create_trade_instance_from_raw(exchange_manager.trader, raw_trade).to_dict()
-        for raw_trade in row_trades
-    )
+    for raw_trade in row_trades:
+        try:
+            trades.append(
+                personal_data.create_trade_instance_from_raw(exchange_manager.trader, raw_trade).to_dict()
+            )
+        except Exception as err:
+            logging.get_logger("get_trades").exception(
+                err,
+                True,
+                f"Unexpected error when parsing [{exchange_manager.exchange_name}] trade "
+                f"({err} {err.__class__.__name__}), trade: {raw_trade}. Ignored trade."
+            )
 
 
 async def get_trades(
@@ -335,7 +343,9 @@ async def _create_order(
     # is private, to use in tests context only
     order = _parse_order_dict(exchange_manager, created_order, True)
     if order is None:
-        logging.get_logger("_create_order").error(f"Unexpected: order hasn't been created.")
+        logging.get_logger("_create_order").warning(
+            f"Unexpected: [{exchange_manager.exchange_name}] order hasn't been created (order: {order_dict})."
+        )
         return order
     if order.status is enums.OrderStatus.PENDING_CREATION and order_creation_timeout > 0:
         try:
@@ -398,10 +408,19 @@ async def get_positions(
     raw_positions = await exchange_manager.exchange.get_positions(symbols=symbols)
     # initialize relevant contracts first as they might be waited for
     trading_exchange_data.update_contracts_from_positions(exchange_manager, raw_positions)
-    dict_positions = [
-        personal_data.create_position_instance_from_raw(
-            exchange_manager.trader, raw_position
-        ).to_dict()
-        for raw_position in raw_positions
-    ]
+    dict_positions = []
+    for raw_position in raw_positions:
+        try:
+            dict_positions.append(
+                personal_data.create_position_instance_from_raw(
+                    exchange_manager.trader, raw_position
+                ).to_dict()
+            )
+        except Exception as err:
+            logging.get_logger("get_positions").exception(
+                err,
+                True,
+                f"Unexpected error when parsing [{exchange_manager.exchange_name}] position"
+                f"({err}. {err.__class__.__name__}), position: {raw_position}. Ignored position."
+            )
     return dict_positions

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/tests/modes/script_keywords/basic_keywords/test_amount.py

@@ -43,7 +43,8 @@ async def test_get_amount_from_input_amount(null_context):
     )
     with pytest.raises(errors.InvalidArgumentError):
         await script_keywords.get_amount_from_input_amount(null_context, "-1")
-
+    with pytest.raises(errors.InvalidArgumentError):
+        await script_keywords.get_amount_from_input_amount(null_context, None)
     with pytest.raises(errors.InvalidArgumentError):
         await script_keywords.get_amount_from_input_amount(null_context, "1sdsqdq")
 

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/tests/modes/script_keywords/basic_keywords/test_price.py

@@ -46,6 +46,10 @@ async def test_get_price_with_offset(null_context):
 
     with pytest.raises(errors.InvalidArgumentError):
         await script_keywords.get_price_with_offset(null_context, "1sdsqdq")
+    with pytest.raises(errors.InvalidArgumentError):
+        await script_keywords.get_price_with_offset(null_context, "%")
+    with pytest.raises(errors.InvalidArgumentError):
+        await script_keywords.get_price_with_offset(null_context, "-%")
 
     with mock.patch.object(personal_data, "get_up_to_date_price", mock.AsyncMock(return_value=200)) \
             as current_price_mock:

{OctoBot-Trading-2.4.201 → OctoBot-Trading-2.4.203}/tests/personal_data/trades/test_trade_factory.py

@@ -58,6 +58,9 @@ class TestTradeFactory:
     async def test_create_trade_instance_from_raw(self):
         _, exchange_manager, trader = await self.init_default()
 
+        with pytest.raises(KeyError):
+            create_trade_instance_from_raw(trader, {})
+
         raw_trade = json.loads(
             """
             {