OctoBot-Trading 2.4.120__tar.gz → 2.4.122__tar.gz

{OctoBot-Trading-2.4.120 → OctoBot-Trading-2.4.122}/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.122] - 2024-11-14
+### Fixed
+[Exchanges] Authorization header
+
+## [2.4.121] - 2024-11-11
+### Added
+[Exchanges] ENABLE_CCXT_REQUESTS_COUNTER option
+
 ## [2.4.120] - 2024-11-05
 ### Fixed
 [Exchanges] Authorization header

{OctoBot-Trading-2.4.120 → OctoBot-Trading-2.4.122/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.120 → OctoBot-Trading-2.4.122}/octobot_trading/constants.py

@@ -73,6 +73,7 @@ EXCHANGE_HTTPS_PROXY_AUTHENTICATED_URL = os.getenv("EXCHANGE_HTTPS_PROXY_AUTHENT
 EXCHANGE_SOCKS_PROXY_AUTHENTICATED_URL = os.getenv("EXCHANGE_SOCKS_PROXY_AUTHENTICATED_URL")
 ENABLE_CCXT_VERBOSE = os_util.parse_boolean_environment_var("ENABLE_CCXT_VERBOSE", "False")
 ENABLE_CCXT_RATE_LIMIT = os_util.parse_boolean_environment_var("ENABLE_CCXT_RATE_LIMIT", "True")
+ENABLE_CCXT_REQUESTS_COUNTER = os_util.parse_boolean_environment_var("ENABLE_CCXT_REQUESTS_COUNTER", "False")
 CCXT_DEFAULT_CACHE_LIMIT = int(os.getenv("CCXT_DEFAULT_CACHE_LIMIT", "1000"))  # 1000: default ccxt value
 CCXT_TRADES_CACHE_LIMIT = int(os.getenv("CCXT_TRADES_CACHE_LIMIT", str(CCXT_DEFAULT_CACHE_LIMIT)))
 CCXT_ORDERS_CACHE_LIMIT = int(os.getenv("CCXT_ORDERS_CACHE_LIMIT", str(CCXT_DEFAULT_CACHE_LIMIT)))

{OctoBot-Trading-2.4.120 → OctoBot-Trading-2.4.122}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -13,6 +13,8 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
+import asyncio
+import aiohttp
 import copy
 import logging
 import typing
@@ -21,6 +23,8 @@ import ccxt.pro as ccxt_pro
 import ccxt.async_support as async_ccxt
 
 import octobot_commons.time_frame_manager as time_frame_manager
+import octobot_commons.aiohttp_util as aiohttp_util
+import octobot_commons.logging as commons_logging
 import octobot_trading.constants as constants
 import octobot_trading.enums as enums
 import octobot_trading.errors as errors
@@ -59,29 +63,40 @@ def create_client(
                 logger.warning(f"No exchange API key set for {exchange_manager.exchange_name}. "
                                f"Enter your account details to enable real trading on this exchange.")
             if should_authenticate and not exchange_manager.is_backtesting:
-                client = exchange_class(_get_client_config(
-                    options, headers, additional_config,
-                    api_key=key, secret=secret, password=password, uid=uid,
-                    auth_token=auth_token, auth_token_header_prefix=auth_token_header_prefix
-                ))
+                client = instantiate_exchange(
+                    exchange_class,
+                    _get_client_config(
+                        options, headers, additional_config,
+                        api_key=key, secret=secret, password=password, uid=uid,
+                        auth_token=auth_token, auth_token_header_prefix=auth_token_header_prefix
+                    ),
+                    exchange_manager.exchange_name,
+                    exchange_manager.proxy_config
+                )
                 is_authenticated = True
                 if exchange_manager.check_credentials:
-                    client.checkRequiredCredentials()
+                    client.check_required_credentials()
             else:
-                client = exchange_class(_get_client_config(options, headers, additional_config))
+                client = instantiate_exchange(
+                    exchange_class,
+                    _get_client_config(options, headers, additional_config),
+                    exchange_manager.exchange_name,
+                    exchange_manager.proxy_config
+                )
         except (ccxt.AuthenticationError, Exception) as e:
             if unauthenticated_exchange_fallback is None:
                 return get_unauthenticated_exchange(
-                    exchange_class, options, headers, additional_config, exchange_manager.proxy_config
+                    exchange_class, options, headers, additional_config,
+                    exchange_manager.exchange_name, exchange_manager.proxy_config
                 ), False
             return unauthenticated_exchange_fallback(e), False
     else:
         client = get_unauthenticated_exchange(
-            exchange_class, options, headers, additional_config, exchange_manager.proxy_config
+            exchange_class, options, headers, additional_config,
+            exchange_manager.exchange_name, exchange_manager.proxy_config
         )
         logger.error("configuration issue: missing login information !")
     client.logger.setLevel(logging.INFO)
-    _use_proxy_if_necessary(client, exchange_manager.proxy_config)
     return client, is_authenticated
 
 
@@ -108,10 +123,19 @@ async def close_client(client):
 
 
 def get_unauthenticated_exchange(
-    exchange_class, options, headers, additional_config, proxy_config: proxy_config_import.ProxyConfig
-):
-    client = exchange_class(_get_client_config(options, headers, additional_config))
+    exchange_class, options, headers, additional_config, identifier: str, proxy_config: proxy_config_import.ProxyConfig
+) -> async_ccxt.Exchange:
+    return instantiate_exchange(
+        exchange_class, _get_client_config(options, headers, additional_config), identifier, proxy_config
+    )
+
+
+def instantiate_exchange(
+    exchange_class, config: dict, identifier: str, proxy_config: proxy_config_import.ProxyConfig
+) -> async_ccxt.Exchange:
+    client = exchange_class(config)
     _use_proxy_if_necessary(client, proxy_config)
+    _use_request_counter_if_enabled(identifier, client)
     return client
 
 
@@ -296,5 +320,40 @@ def _get_client_config(
     return config
 
 
+def _use_request_counter_if_enabled(identifier: str, ccxt_client: async_ccxt.Exchange):
+    """
+    Replaces the given exchange async session by an aiohttp_util.CounterClientSession
+    WARNING: should only be called right after creating the exchange (to avoid interrupting
+     open requests from current session)
+    """
+    if constants.ENABLE_CCXT_REQUESTS_COUNTER:
+        # use session with request counter
+        try:
+            # 1. create ssl context and other required elements if necessary
+            ccxt_client.open()
+            previous_session = ccxt_client.session
+            # 2. create patched session using the same params as a normal one
+            # same as in ccxt.async_support.exchange.py#open()
+            # connector = aiohttp.TCPConnector(ssl=self.ssl_context, loop=self.asyncio_loop, enable_cleanup_closed=True)
+            new_connector = aiohttp.TCPConnector(
+                ssl=ccxt_client.ssl_context, loop=ccxt_client.asyncio_loop, enable_cleanup_closed=True
+            )
+            counter_session = aiohttp_util.CounterClientSession(
+                identifier,
+                loop=ccxt_client.asyncio_loop,
+                connector=new_connector,
+                trust_env=previous_session.trust_env,
+            )
+            # 3. replace session
+            ccxt_client.session = counter_session
+            # 4. close replaced session in task to avoid making this function a coroutine
+            asyncio.create_task(previous_session.close())
+            commons_logging.get_logger(__name__).info(f"Request counter enabled for {identifier}")
+        except Exception as err:
+            commons_logging.get_logger(__name__).exception(
+                err, True, f"Error when initializing {identifier} request counter: {err}"
+            )
+
+
 def ccxt_exchange_class_factory(exchange_name):
     return getattr(async_ccxt, exchange_name)

{OctoBot-Trading-2.4.120 → OctoBot-Trading-2.4.122}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -257,6 +257,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         return ccxt_client_util.get_unauthenticated_exchange(
             self.exchange_type,
             self.options, self.headers, self.additional_config,
+            self.exchange_manager.exchange_name,
             self.exchange_manager.proxy_config
         )
 

{OctoBot-Trading-2.4.120 → OctoBot-Trading-2.4.122}/tests/exchanges/implementations/test_default_websocket_exchange.py

@@ -22,6 +22,7 @@ import octobot_trading.enums as enums
 import pytest
 
 from tests.exchanges import liquid_exchange_manager as liquid_exchange_manager_fixture, DEFAULT_EXCHANGE_NAME
+from tests import skipped_on_github_CI
 
 # All test coroutines will be treated as marked.
 pytestmark = pytest.mark.asyncio
@@ -123,7 +124,7 @@ def default_websocket_exchange(liquid_exchange_manager_fixture):
     yield MockedWebSocketExchange(liquid_exchange_manager_fixture.config, liquid_exchange_manager_fixture)
 
 
-async def test_start_receive_feeds_and_stop(default_websocket_exchange):
+async def test_start_receive_feeds_and_stop(default_websocket_exchange, skipped_on_github_CI):
     await default_websocket_exchange.init_websocket(
         default_websocket_exchange.exchange_manager.exchange_config.traded_time_frames,
         default_websocket_exchange.exchange_manager.exchange_config.traded_symbol_pairs,