OctoBot-Trading 2.4.196__tar.gz → 2.4.198__tar.gz

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/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.198] - 2025-07-05
+### Fixed
+[Orders] fix _is_synchronization_enabled on cleared orders
+
+## [2.4.197] - 2025-06-26
+### Fixed
+[Proxy] handle all aiohttp proxy errors
+
 ## [2.4.196] - 2025-06-24
 ### Fixed
 [Portfolio] fix get accepted deltas KeyError

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -5,7 +5,6 @@ OctoBot-Commons<1.10,>=1.9.64
 OctoBot-Tentacles-Manager<2.10,>=2.9
 trading-backend>=1.2.35
 ccxt==4.4.85
-aiohttp_socks==0.10.1
 cryptography
 sortedcontainers==2.4.0
 tinydb==4.5.2

{OctoBot-Trading-2.4.196/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.198}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -14,7 +14,12 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
 import asyncio
-import aiohttp_socks
+try:
+    from aiohttp_socks import ProxyConnectionError
+except ImportError:
+    # local mock in case aiohttp_socks is not available
+    class ProxyConnectionError(Exception):
+        pass
 import os
 import ssl
 import aiohttp
@@ -315,20 +320,28 @@ def _use_proxy_if_necessary(client, proxy_config: proxy_config_import.ProxyConfi
         if (client.socks_proxy_sessions is None):
             client.socks_proxy_sessions = {}
         if (proxy_url not in client.socks_proxy_sessions):
-            previous_aiohttp_socks_connector = client.aiohttp_socks_connector
-            client.aiohttp_socks_connector = aiohttp_socks.ProxyConnector.from_url(
-                proxy_url,
-                # extra args copied from self.open()
-                ssl=client.ssl_context,
-                loop=client.asyncio_loop,
-                use_dns_cache=not proxy_config.disable_dns_cache,
-                enable_cleanup_closed=True
-            )
-            client.socks_proxy_sessions[proxy_url] = aiohttp.ClientSession(
-                loop=client.asyncio_loop, connector=client.aiohttp_socks_connector,
-                trust_env=client.aiohttp_trust_env
-            )
-            asyncio.create_task(_close_previous_session_and_connector(None, previous_aiohttp_socks_connector))
+            try:
+                import aiohttp_socks
+                previous_aiohttp_socks_connector = client.aiohttp_socks_connector
+                client.aiohttp_socks_connector = aiohttp_socks.ProxyConnector.from_url(
+                    proxy_url,
+                    # extra args copied from self.open()
+                    ssl=client.ssl_context,
+                    loop=client.asyncio_loop,
+                    use_dns_cache=not proxy_config.disable_dns_cache,
+                    enable_cleanup_closed=True
+                )
+                client.socks_proxy_sessions[proxy_url] = aiohttp.ClientSession(
+                    loop=client.asyncio_loop, connector=client.aiohttp_socks_connector,
+                    trust_env=client.aiohttp_trust_env
+                )
+                asyncio.create_task(_close_previous_session_and_connector(
+                    None, previous_aiohttp_socks_connector
+                ))
+            except ImportError as err:
+                raise ImportError(
+                    "The aiohttp_socks python library is not installed and is required to use a socks proxy"
+                ) from err
     elif proxy_config.disable_dns_cache:
         # rewrite of async_ccxt.exchange.client.open()
         _init_ccxt_client_session_requirements(client)
@@ -509,8 +522,10 @@ def get_proxy_error_if_any(ccxt_connector, error: Exception) -> typing.Optional[
     cause_error = error
     while cause_error and depth < max_depth:
         if isinstance(cause_error, (
-            aiohttp.ClientProxyConnectionError, aiohttp.ClientHttpProxyError, aiohttp_socks.ProxyConnectionError
+            # Proxy errors
+            aiohttp.ClientProxyConnectionError, aiohttp.ClientHttpProxyError, ProxyConnectionError
         )) or (
+            # Connector error with the configured proxy host in description
             isinstance(cause_error, aiohttp.ClientConnectorError)
             and ccxt_connector.exchange_manager.proxy_config.proxy_host in str(cause_error)
         ):

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -16,9 +16,9 @@
 #  License along with this library.
 import contextlib
 import decimal
+import aiohttp
 import ccxt.async_support as ccxt
 import ccxt.static_dependencies.ecdsa.der
-import aiohttp_socks
 import typing
 import inspect
 import binascii
@@ -123,7 +123,13 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         """
         Override if necessary
         """
-        await client.load_markets(reload=reload)
+        try:
+            await client.load_markets(reload=reload)
+        except Exception as err:
+            # ensure this is not a proxy error, raise dedicated error if it is
+            if proxy_error := ccxt_client_util.get_proxy_error_if_any(self, err):
+                raise octobot_trading.errors.ExchangeProxyError(proxy_error) from err
+            raise
 
     @ccxt_client_util.converted_ccxt_common_errors
     @connectors_util.retried_failed_network_request()
@@ -1094,17 +1100,6 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             caller_function_name = inspect.stack()[2].function
             exchanges.log_time_sync_error(self.logger, self.name, err, caller_function_name)
             raise octobot_trading.errors.FailedRequest(html_util.get_html_summary_if_relevant(err)) from err
-        except (ccxt.ExchangeNotAvailable, aiohttp_socks.ProxyConnectionError) as err:
-            self.raise_or_prefix_proxy_error_if_relevant(
-                err,
-                octobot_trading.errors.NetworkError(
-                    f"Failed to execute request: {err.__class__.__name__}: {html_util.get_html_summary_if_relevant(err)}"
-                )
-            )
-        except ccxt.NetworkError as err:
-            raise octobot_trading.errors.NetworkError(
-                f"Request network error ({err.__class__.__name__}): {html_util.get_html_summary_if_relevant(err)}"
-            ) from err
         except ccxt.AuthenticationError as err:
             error_class = (
                 octobot_trading.errors.InvalidAPIKeyIPWhitelistError
@@ -1115,7 +1110,12 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 err,
                 error_class(html_util.get_html_summary_if_relevant(err))
             )
-        except ccxt.ExchangeError as err:
+        except (
+            # Generic connection / exchange error
+            ccxt.ExchangeNotAvailable, ccxt.ExchangeError,
+            # Proxy errors
+            aiohttp.ClientHttpProxyError, aiohttp.ClientProxyConnectionError, ccxt_client_util.ProxyConnectionError
+        ) as err:
             error_message = html_util.get_html_summary_if_relevant(err)
             if self.exchange_manager.exchange.is_ip_whitelist_error(err):
                 # ensure this is not an IP whitelist error
@@ -1123,5 +1123,12 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             if self.exchange_manager.exchange.is_authentication_error(err):
                 # ensure this is not an unhandled authentication error
                 raise octobot_trading.errors.AuthenticationError(error_message) from err
-            # otherwise just forward exception
-            raise
+            # keep ccxt.ExchangeError, convert others into network error
+            raised_error = None if isinstance(err, ccxt.ExchangeError) else octobot_trading.errors.NetworkError(
+                f"Failed to execute request: {err.__class__.__name__}: {error_message}"
+            )
+            self.raise_or_prefix_proxy_error_if_relevant(err, raised_error)
+        except ccxt.NetworkError as err:
+            raise octobot_trading.errors.NetworkError(
+                f"Request network error ({err.__class__.__name__}): {html_util.get_html_summary_if_relevant(err)}"
+            ) from err

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/octobot_trading/personal_data/orders/order_state.py

@@ -148,11 +148,15 @@ class OrderState(state_class.State):
 
     @staticmethod
     def ensure_not_cleared(order):
-        if order.is_cleared():
+        if order is None or order.is_cleared():
             raise octobot_trading.errors.InvalidOrderState(f"Order has already been cleared. Order: {order}")
 
     def _is_synchronization_enabled(self):
-        return self.order.is_synchronization_enabled()
+        try:
+            self.ensure_not_cleared(self.order)
+            return self.order.is_synchronization_enabled()
+        except octobot_trading.errors.InvalidOrderState:
+            return super()._is_synchronization_enabled()
 
     def clear(self):
         """

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/octobot_trading/personal_data/portfolios/asset.py

@@ -15,6 +15,7 @@
 #  License along with this library.
 import contextlib
 import copy
+import decimal
 
 import octobot_commons.constants as common_constants
 import octobot_commons.logging as logging
@@ -25,10 +26,10 @@ import octobot_trading.errors as errors
 
 class Asset:
     def __init__(self, name, available, total):
-        self.name = name
+        self.name: str = name
 
-        self.available = available
-        self.total = total
+        self.available: decimal.Decimal = available
+        self.total: decimal.Decimal = total
 
     def __str__(self):
         return f"{self.__class__.__name__}: {self.name} | " \

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/octobot_trading/personal_data/portfolios/assets/future_asset.py

@@ -13,6 +13,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
+import decimal
 
 import octobot_trading.constants as constants
 import octobot_trading.personal_data.portfolios.asset as asset_class
@@ -38,19 +39,19 @@ class FutureAsset(asset_class.Asset):
         """
         super().__init__(name, available, total)
         # Unrealized profit and loss
-        self.unrealized_pnl = unrealized_pnl
+        self.unrealized_pnl: decimal.Decimal = unrealized_pnl
 
         # total initial margin required with current mark price
-        self.initial_margin = initial_margin
+        self.initial_margin: decimal.Decimal = initial_margin
 
         # The Wallet balance. When using Cross Margin, the number minus the unclosed loss is the real wallet balance.
-        self.wallet_balance = wallet_balance if wallet_balance != constants.ZERO else total
+        self.wallet_balance: decimal.Decimal = wallet_balance if wallet_balance != constants.ZERO else total
 
         # margin required for positions with current mark price
-        self.position_margin = position_margin
+        self.position_margin: decimal.Decimal = position_margin
 
         # margin required for open orders with current mark price
-        self.order_margin = order_margin
+        self.order_margin: decimal.Decimal = order_margin
 
     def __str__(self):
         return super().__str__() + " | " \

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/octobot_trading/personal_data/portfolios/assets/margin_asset.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_trading.constants as constants
 import octobot_trading.personal_data.portfolios.asset as asset_class
 
@@ -23,9 +25,9 @@ class MarginAsset(asset_class.Asset):
                  interest=constants.ZERO,
                  locked=constants.ZERO):
         super().__init__(name, available, total)
-        self.borrowed = borrowed
-        self.interest = interest
-        self.locked = locked
+        self.borrowed: decimal.Decimal = borrowed
+        self.interest: decimal.Decimal = interest
+        self.locked: decimal.Decimal = locked
 
     def __str__(self):
         return super().__str__() + " | " \

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/requirements.txt

@@ -9,7 +9,6 @@ trading-backend>=1.2.35
 
 # Exchange connection requirements
 ccxt==4.4.85 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
-aiohttp_socks==0.10.1   # used by ccxt socks proxy aiohttp connectors
 
 cryptography # Never specify a version (managed by https://github.com/Drakkar-Software/OctoBot-PyPi-Linux-Deployer)
 

{OctoBot-Trading-2.4.196 → OctoBot-Trading-2.4.198}/tests/exchanges/connectors/ccxt/test_ccxt_connector.py

@@ -18,7 +18,6 @@ import decimal
 import ccxt
 import aiohttp
 import aiohttp.client_reqrep
-import aiohttp_socks
 
 import mock
 from mock import patch
@@ -27,7 +26,7 @@ import octobot_trading.exchanges.connectors as exchange_connectors
 import octobot_trading.enums as enums
 import octobot_trading.errors
 import octobot_trading.exchange_data.contracts as contracts
-import octobot_trading.exchanges.connectors.ccxt.ccxt_clients_cache as ccxt_clients_cache
+import octobot_trading.exchanges.connectors.ccxt.ccxt_client_util as ccxt_client_util
 import pytest
 
 import tests.exchanges.connectors.ccxt.mock_exchanges_data as mock_exchanges_data
@@ -259,20 +258,32 @@ async def test_error_describer(ccxt_connector):
     with pytest.raises(octobot_trading.errors.ExchangeProxyError):
         # proxy connection error
         with ccxt_connector.error_describer():
-            raise ccxt.AuthenticationError from aiohttp.ClientProxyConnectionError(
+            raise ccxt.ExchangeError from aiohttp.ClientProxyConnectionError(
+                aiohttp.client_reqrep.ConnectionKey("host", 11, True, True, None, None, None), OSError("plop")
+            )
+    with pytest.raises(octobot_trading.errors.ExchangeProxyError):
+        # proxy client error
+        with ccxt_connector.error_describer():
+            raise ccxt.ExchangeError from aiohttp.ClientHttpProxyError(
+                aiohttp.client_reqrep.ConnectionKey("host", 11, True, True, None, None, None), OSError("plop")
+            )
+    with pytest.raises(octobot_trading.errors.ExchangeProxyError):
+        # socks proxy error
+        with ccxt_connector.error_describer():
+            raise ccxt.ExchangeError from ccxt_client_util.ProxyConnectionError(
                 aiohttp.client_reqrep.ConnectionKey("host", 11, True, True, None, None, None), OSError("plop")
             )
     ccxt_connector.exchange_manager.proxy_config.proxy_host = "host"
     with pytest.raises(octobot_trading.errors.ExchangeProxyError):
         # proxy connection error
         with ccxt_connector.error_describer():
-            raise ccxt.AuthenticationError from aiohttp_socks.ProxyConnectionError(
+            raise ccxt.AuthenticationError from ccxt_client_util.ProxyConnectionError(
                 aiohttp.client_reqrep.ConnectionKey("host", 11, True, True, None, None, None), OSError("plop")
             )
     with pytest.raises(octobot_trading.errors.ExchangeProxyError):
         # proxy connection error
         with ccxt_connector.error_describer():
-            raise aiohttp_socks.ProxyConnectionError(
+            raise ccxt_client_util.ProxyConnectionError(
                 aiohttp.client_reqrep.ConnectionKey("host", 11, True, True, None, None, None), OSError("plop")
             )
     with mock.patch.object(