OctoBot-Trading 2.4.146__tar.gz → 2.4.148__tar.gz

{OctoBot-Trading-2.4.146 → OctoBot-Trading-2.4.148}/CHANGELOG.md

@@ -4,6 +4,15 @@ 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.148] - 2025-01-20
+### Added
+[Exchanges] support custom domains
+[Exchanges] add INCLUDE_DISABLED_SYMBOLS_IN_AVAILABLE_SYMBOLS
+
+## [2.4.147] - 2025-01-13
+### Fixed
+[Exchange] properly propagate ExchangeOrderCancelError
+
 ## [2.4.146] - 2025-01-12
 ### Added
 [Exceptions] add UntradableSymbolError

{OctoBot-Trading-2.4.146 → OctoBot-Trading-2.4.148/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.146 → OctoBot-Trading-2.4.148}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -14,6 +14,7 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
 import asyncio
+import os
 import aiohttp
 import copy
 import logging
@@ -66,7 +67,7 @@ def create_client(
                 client = instantiate_exchange(
                     exchange_class,
                     _get_client_config(
-                        options, headers, additional_config,
+                        exchange_class, 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
                     ),
@@ -80,7 +81,7 @@ def create_client(
             else:
                 client = instantiate_exchange(
                     exchange_class,
-                    _get_client_config(options, headers, additional_config),
+                    _get_client_config(exchange_class, options, headers, additional_config),
                     exchange_manager.exchange_name,
                     exchange_manager.proxy_config,
                     allow_request_counter=allow_request_counter
@@ -128,7 +129,10 @@ def get_unauthenticated_exchange(
     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
+        exchange_class,
+        _get_client_config(exchange_class, options, headers, additional_config),
+        identifier,
+        proxy_config
     )
 
 
@@ -303,7 +307,7 @@ def _use_proxy_if_necessary(client, proxy_config: proxy_config_import.ProxyConfi
 
 
 def _get_client_config(
-    options, headers, additional_config,
+    exchange_class, options, headers, additional_config,
     api_key=None, secret=None, password=None, uid=None,
     auth_token=None, auth_token_header_prefix=None
 ):
@@ -324,10 +328,50 @@ def _get_client_config(
         config['password'] = password
     if uid is not None:
         config['uid'] = uid
-    config.update(additional_config or {})
+    config.update({**_get_custom_domain_config(exchange_class), **(additional_config or {})})
     return config
 
 
+def _get_custom_domain_config(exchange_class):
+    old, new = _get_replaced_custom_domains(exchange_class)
+    if not (old and new):
+        return {}
+    if url_config := exchange_class().describe()[ccxt_enums.ExchangeColumns.URLS.value]:
+        commons_logging.get_logger(__name__).info(
+            f"Using custom domain for {exchange_class.__name__}: {old} is replaced by {new}"
+        )
+        return {
+            ccxt_enums.ExchangeColumns.URLS.value: _get_patched_url_config(url_config, old, new)
+        }
+    return {}
+
+
+def _get_replaced_custom_domains(exchange_class):
+    identifier = exchange_class.__name__.upper()
+    if custom_domain := os.getenv(f"{identifier}_CUSTOM_DOMAIN"):
+        split = custom_domain.split(":")
+        if len(split) == 2:
+            return split[0], split[1]
+        else:
+            commons_logging.get_logger(__name__).error(
+                f"Invalid {identifier} custom domain config. Expected syntax is to_replace_domain:updated_domain "
+                f"Example: MEXC_CUSTOM_DOMAIN=mexc.com:mexc.co"
+            )
+    return None, None
+
+
+def _get_patched_url_config(url_config: dict, old: str, new: str):
+    updated_config = {}
+    for key, val in url_config.items():
+        if isinstance(val, dict):
+            updated_config[key] = _get_patched_url_config(val, old, new)
+        elif isinstance(val, str):
+            updated_config[key] = val.replace(old, new)
+        else:
+            updated_config[key] = val
+    return updated_config
+
+
 def _use_request_counter(identifier: str, ccxt_client: async_ccxt.Exchange):
     """
     Replaces the given exchange async session by an aiohttp_util.CounterClientSession

{OctoBot-Trading-2.4.146 → OctoBot-Trading-2.4.148}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -125,7 +125,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 )
 
             # initialize symbols and timeframes
-            self.symbols = self.get_client_symbols(active_only=True)
+            self.symbols = self.exchange_manager.exchange.get_all_available_symbols(active_only=True)
             self.time_frames = self.get_client_time_frames()
 
         except (ccxt.ExchangeNotAvailable, ccxt.RequestTimeout) as e:
@@ -718,6 +718,9 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             raise octobot_trading.errors.NotSupported(
                 html_util.get_html_summary_if_relevant(e)
             ) from e
+        except octobot_trading.errors.ExchangeOrderCancelError:
+            # propagate error
+            raise
         except Exception as e:
             self.logger.exception(
                 e,

{OctoBot-Trading-2.4.146 → OctoBot-Trading-2.4.148}/octobot_trading/exchanges/types/rest_exchange.py

@@ -51,6 +51,8 @@ class RestExchange(abstract_exchange.AbstractExchange):
     # set True when get_fixed_market_status should adapt amounts for contract size
     # (amounts are in not kept as contract size with OctoBot)
     ADAPT_MARKET_STATUS_FOR_CONTRACT_SIZE = False
+    # set True when disabled symbols should still be considered (ex: mexc with its temporary api trading disabled symbols)
+    INCLUDE_DISABLED_SYMBOLS_IN_AVAILABLE_SYMBOLS = False
     REQUIRE_ORDER_FEES_FROM_TRADES = False  # set True when get_order is not giving fees on closed orders and fees
     # should be fetched using recent trades.
     REQUIRE_CLOSED_ORDERS_FROM_RECENT_TRADES = False  # set True when get_closed_orders is not supported
@@ -731,7 +733,9 @@ class RestExchange(abstract_exchange.AbstractExchange):
         """
         :return: the list of all symbols supported by the exchange
         """
-        return self.connector.get_client_symbols(active_only=active_only)
+        return self.connector.get_client_symbols(
+            active_only=False if self.INCLUDE_DISABLED_SYMBOLS_IN_AVAILABLE_SYMBOLS else active_only
+        )
 
     async def get_all_tradable_symbols(self, active_only=True) -> set[str]:
         """

{OctoBot-Trading-2.4.146 → OctoBot-Trading-2.4.148}/tests/exchanges/connectors/ccxt/test_ccxt_connector.py

@@ -62,7 +62,7 @@ async def test_initialize_impl_with_none_symbols_and_timeframes(ccxt_connector):
     with patch.object(ccxt_connector, 'client', new=MockCCXT()) as mocked_ccxt, \
             patch.object(ccxt_connector, '_ensure_auth', new=mock.AsyncMock()) as _ensure_auth_mock:
         await ccxt_connector.initialize_impl()
-        assert ccxt_connector.symbols == set()
+        assert len(ccxt_connector.symbols) == 171   # all enabled symbols
         assert ccxt_connector.time_frames == set()
         assert mocked_ccxt.set_markets_calls in ([[]], [])  # depends on call order
         _ensure_auth_mock.assert_called_once()
@@ -90,7 +90,7 @@ async def test_initialize_impl_with_empty_symbols_and_timeframes(ccxt_connector)
     with patch.object(ccxt_connector, 'client', new=MockCCXT()) as mocked_ccxt, \
             patch.object(ccxt_connector, '_ensure_auth', new=mock.AsyncMock()) as _ensure_auth_mock:
         await ccxt_connector.initialize_impl()
-        assert ccxt_connector.symbols == set()
+        assert len(ccxt_connector.symbols) == 171   # all enabled symbols
         assert ccxt_connector.time_frames == set()
         assert mocked_ccxt.set_markets_calls in ([[]], [])  # depends on call order
         _ensure_auth_mock.assert_called_once()
@@ -127,12 +127,9 @@ async def test_initialize_impl(ccxt_connector):
 
     with patch.object(ccxt_connector, 'client', new=MockCCXT()) as mocked_ccxt, \
         patch.object(ccxt_connector, '_ensure_auth', new=mock.AsyncMock()) as _ensure_auth_mock:
+        ccxt_connector.exchange_manager.exchange.INCLUDE_DISABLED_SYMBOLS_IN_AVAILABLE_SYMBOLS = True
         await ccxt_connector.initialize_impl()
-        assert ccxt_connector.symbols == {
-            "BTC/USDT",
-            "ETH/USDT",
-            "ETH/BTC",
-        }
+        assert len(ccxt_connector.symbols) == 541   # all enabled + diasabled symbols
         assert ccxt_connector.time_frames == {
             "1h",
             "2h",