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

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

@@ -4,6 +4,10 @@ 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

{OctoBot-Trading-2.4.202 → 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.202
+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.202](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.202/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.202
+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.202](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.202 → OctoBot-Trading-2.4.203}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.202](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.202 → 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.202"  # major.minor.revision
+VERSION = "2.4.203"  # major.minor.revision

{OctoBot-Trading-2.4.202 → 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.202 → 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.202 → 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(
@@ -400,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.202 → 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(
             """
             {