Merge pull request #2505 from Drakkar-Software/dev

Dev merge

CHANGELOG.md

@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *It is strongly advised to perform an update of your tentacles after updating OctoBot. (start.py tentacles --install --all)*
 
+## [1.0.6] - 2024-01-09
+### Added
+- [TradingModes] Improved documentation and added links to full guides
+- [InstantMAEvaluator] Add trigger threshold to avoid triggering at each price update
+### Updated
+- [CCXT] update to ccxt 4.2.10
+- [ChatGPT] update to openai 1.7.0
+- [DailyTradingMode] Enable futures position increase: add warning
+### Fixed
+- [DailyTradingMode] handle invalid MAX_CURRENCY_RATIO
+- [TradingView] Fix SIGNAL=CANCEL docs typo
+- [Exchanges] MEXC orders synchronization issues
+- [Exchanges] HTX renamed Huobi into HTX
+### Removed
+- [Exchanges] Bittrex
+
 ## [1.0.5] - 2023-12-19
 ### Added
 - [GPTEvaluator] Settings to limit used tokens and disable re-evaluation
@@ -47,7 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Webhook] Support Ngrok custom domains
 ### Updated
 - [ChatGPT] Default GPT Trading profile now uses the DCA trading mode 
-- [TradingView] Revamped docs on https://www.octobot.cloud/guides/octobot-interfaces/tradingview
+- [TradingView] Revamped docs on https://www.octobot.cloud/en/guides/octobot-interfaces/tradingview
 - [DCATrading] Improved error messages
 - [WebInterface] Do not select duplicated profiles by default
 - [DataCollector] Make errors clearer

README.md

@@ -1,4 +1,4 @@
-# OctoBot [1.0.5](https://octobot.click/gh-changelog)
+# OctoBot [1.0.6](https://octobot.click/gh-changelog)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg?logo=pypi)](https://octobot.click/gh-pypi)
 [![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot)
 [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg?logo=docker)](https://octobot.click/gh-dockerhub)
@@ -31,11 +31,11 @@ We are looking forward to receiving your feedback on our new OctoBot based syste
 
 ## What is Octobot  ?
 <p align="middle">
-  <a href="https://www.octobot.cloud/guides/octobot-interfaces/web?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_what_is_octobot_web">
+  <a href="https://www.octobot.cloud/en/guides/octobot-interfaces/web?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_what_is_octobot_web">
     <img src="../assets/dashboard.png" height="414" alt="Follow your profits using OctoBot directly from its web interface">
   </a>  
   &nbsp;&nbsp;&nbsp;&nbsp;    
-  <a href="https://www.octobot.cloud/guides/octobot-interfaces/telegram?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_what_is_octobot_telegram">
+  <a href="https://www.octobot.cloud/en/guides/octobot-interfaces/telegram?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_what_is_octobot_telegram">
     <img src="../assets/telegram-interface.png" height="414" alt="Follow each trade and profits of your OctoBot and send it commands from telegram">
   </a>  
 </p>
@@ -44,22 +44,22 @@ We are looking forward to receiving your feedback on our new OctoBot based syste
 [Octobot](https://www.octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_what_is_octobot) is a powerful open-source cryptocurrency trading robot.
 
 OctoBot is highly customizable using its configuration and tentacles system.  
-You can build your own bot using the infinite [configuration](https://www.octobot.cloud/guides/octobot-configuration/profile-configuration?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=configuration) possibilities such as  **technical analysis**, **social media processing** or even **external statistics management** like google trends.  
+You can build your own bot using the infinite [configuration](https://www.octobot.cloud/en/guides/octobot-configuration/profile-configuration?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=configuration) possibilities such as  **technical analysis**, **social media processing** or even **external statistics management** like google trends.  
 
 OctoBot is **AI ready**: Python being the main language for OctoBot, it's easy to integrate machine-learning libraries such as [Tensorflow](https://github.com/tensorflow/tensorflow) or any other libraries and take advantage of all the available data and create a very powerful trading strategy.  
 
 Octobot's main feature is **evolution**, you can : 
 - Share your configurations with other octobot users.
-- [Install](https://www.octobot.cloud/guides/octobot-advanced-usage/tentacle-manager?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=install_tentacles), [modify](https://www.octobot.cloud/guides/octobot-tentacles-development/create-a-tentacle?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=modify_tentacles) and even [create](https://www.octobot.cloud/guides/octobot-tentacles-development/create-a-tentacle?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=create_tentacles) new tentacles to build your ideal cryptocurrency trading robot.
-- [Contribute](https://www.octobot.cloud/guides/octobot-developers-environment/setup-your-environment?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=contribute) to improve OctoBot core repositories and tentacles.
+- [Install](https://www.octobot.cloud/en/guides/octobot-advanced-usage/tentacle-manager?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=install_tentacles), [modify](https://www.octobot.cloud/en/guides/octobot-tentacles-development/create-a-tentacle?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=modify_tentacles) and even [create](https://www.octobot.cloud/en/guides/octobot-tentacles-development/create-a-tentacle?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=create_tentacles) new tentacles to build your ideal cryptocurrency trading robot.
+- [Contribute](https://www.octobot.cloud/en/guides/octobot-developers-environment/setup-your-environment?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=contribute) to improve OctoBot core repositories and tentacles.
 
-Looking for more info ? Check out our Octobot guides at [octobot.cloud/guides](https://www.octobot.cloud/guides/?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=checkout_guides)
+Looking for more info ? Check out our Octobot guides at [octobot.cloud/guides](https://www.octobot.cloud/en/guides/?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=checkout_guides)
 
 ## Installation  
 OctoBot's installation is **very simple**, you can either:
 - [Deploy your OctoBot on OctoBot Cloud](https://octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_deploy_on_cloud). With OctoBot cloud, experience hassle-free installation, updates, and maintenance - leave it all to us! Your robot will also benefit from cloud only features.
-- [Download and install](https://www.octobot.cloud/guides/octobot-installation/local?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_local_installation) OctoBot on your computer or server and enjoy all features for free.
-- Install OctoBot [using docker](https://www.octobot.cloud/guides/octobot-installation/with-docker?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_docker_installation).
+- [Download and install](https://www.octobot.cloud/en/guides/octobot-installation/local?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_local_installation) OctoBot on your computer or server and enjoy all features for free.
+- Install OctoBot [using docker](https://www.octobot.cloud/en/guides/octobot-installation/with-docker?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_docker_installation).
 
     Docker install in one line summary:
     ```
@@ -68,18 +68,18 @@ OctoBot's installation is **very simple**, you can either:
     Your OctoBot will be accessible on [http://localhost](http://localhost).
 
 ## Exchanges
-[![Binance supported exchange partnership](../assets/binance-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/binance?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=binance)
-[![Okx supported exchange partnership](../assets/okex-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/okx?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=okx)
-[![Kucoin supported exchange partnership](../assets/kucoin-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/kucoin?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=kucoin)
-[![Crypto.com supported exchange partnership](../assets/cryptocom-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/crypto-com?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=crypto-com)
-[![Huobi supported exchange partnership](../assets/huobi-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/huobi?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=huobi)
-[![Hollaex supported exchange partnership](../assets/hollaex-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/hollaex?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=hollaex)
-[![Coinbase supported exchange](../assets/coinbasepro-logo.png)](https://www.octobot.cloud/guides/octobot-supported-exchanges/coinbase?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=coinbase)
-[![GateIO supported exchange partnership](../assets/gateio-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/gateio?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=gateio)
-[![Ascendex supported exchange partnership](../assets/ascendex-logo.png)](https://www.octobot.cloud/guides/octobot-partner-exchanges/ascendex?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=ascendex)
+[![Binance supported exchange partnership](../assets/binance-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/binance?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=binance)
+[![Okx supported exchange partnership](../assets/okex-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/okx?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=okx)
+[![Kucoin supported exchange partnership](../assets/kucoin-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/kucoin?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=kucoin)
+[![Crypto.com supported exchange partnership](../assets/cryptocom-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/crypto-com?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=crypto-com)
+[![Huobi supported exchange partnership](../assets/huobi-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/huobi?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=huobi)
+[![Hollaex supported exchange partnership](../assets/hollaex-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/hollaex?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=hollaex)
+[![Coinbase supported exchange](../assets/coinbasepro-logo.png)](https://www.octobot.cloud/en/guides/octobot-supported-exchanges/coinbase?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=coinbase)
+[![GateIO supported exchange partnership](../assets/gateio-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/gateio?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=gateio)
+[![Ascendex supported exchange partnership](../assets/ascendex-logo.png)](https://www.octobot.cloud/en/guides/octobot-partner-exchanges/ascendex?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=ascendex)
 
-Octobot supports many [exchanges](https://www.octobot.cloud/guides/exchanges?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=exchanges) thanks to the [ccxt library](https://github.com/ccxt/ccxt). 
-To activate trading on an exchange, just configure OctoBot with your API keys as described [on the exchange setup guides](https://www.octobot.cloud/guides/octobot-configuration/exchanges?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=exchanges_setup_guides).
+Octobot supports many [exchanges](https://www.octobot.cloud/en/guides/exchanges?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=exchanges) thanks to the [ccxt library](https://github.com/ccxt/ccxt). 
+To activate trading on an exchange, just configure OctoBot with your API keys as described [on the exchange setup guides](https://www.octobot.cloud/en/guides/octobot-configuration/exchanges?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=exchanges_setup_guides).
 
 
 ### Paper trading
@@ -88,7 +88,7 @@ To trade on any exchange, just enable the exchange in your OctoBot. This you to
 No exchange credential is required.
 
 ### Real trading
-To use your real exchange account with OctoBot, enter your exchange API keys as described [on the exchange guides](https://www.octobot.cloud/guides/exchanges?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=exchanges_guides). 
+To use your real exchange account with OctoBot, enter your exchange API keys as described [on the exchange guides](https://www.octobot.cloud/en/guides/exchanges?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=exchanges_guides). 
 
 ## Testing trading strategies
 

additional_tests/exchanges_tests/__init__.py

@@ -26,7 +26,6 @@
 import octobot_trading.api as trading_api
 import octobot_trading.exchanges as exchanges
 import octobot_trading.constants as trading_constants
-import octobot_trading.enums as enums
 import octobot_trading.errors as errors
 import octobot_trading.exchange_channel as exchange_channel
 import octobot_trading.personal_data as personal_data

additional_tests/exchanges_tests/abstract_authenticated_exchange_tester.py

@@ -69,6 +69,7 @@ class AbstractAuthenticatedExchangeTester:
     IGNORE_EXCHANGE_TRADE_ID = False    # set True when trade.exchange_trade_id can't be set
     MAX_TRADE_USD_VALUE = decimal.Decimal(8000)
     MIN_TRADE_USD_VALUE = decimal.Decimal("0.1")
+    IS_ACCOUNT_ID_AVAILABLE = True  # set False when get_account_id is not available and should be checked
 
     # Implement all "test_[name]" methods, call super() to run the test, pass to ignore it.
     # Override the "inner_test_[name]" method to override a test content.
@@ -109,6 +110,19 @@ def check_portfolio_content(self, portfolio):
                 at_least_one_value = True
         assert at_least_one_value
 
+    async def test_get_account_id(self):
+        async with self.local_exchange_manager():
+            await self.inner_test_get_account_id()
+
+    async def inner_test_get_account_id(self):
+        if self.IS_ACCOUNT_ID_AVAILABLE:
+            account_id = await self.exchange_manager.exchange.get_account_id()
+            assert account_id
+            assert isinstance(account_id, str)
+        else:
+            with pytest.raises(NotImplementedError):
+                await self.exchange_manager.exchange.get_account_id()
+
     async def test_create_and_cancel_limit_orders(self):
         async with self.local_exchange_manager():
             await self.inner_test_create_and_cancel_limit_orders()
@@ -486,7 +500,7 @@ def check_raw_closed_orders(self, closed_orders):
             assert len(closed_orders) - len(incomplete_fees_orders) >= 2
 
     def check_parsed_closed_order(
-            self, order: personal_data.Order, incomplete_fee_orders: list, allow_incomplete_fees: bool
+        self, order: personal_data.Order, incomplete_fee_orders: list, allow_incomplete_fees: bool
     ):
         assert order.symbol
         assert order.timestamp

additional_tests/exchanges_tests/test_ascendex.py

@@ -39,6 +39,10 @@ async def test_get_portfolio_with_market_filter(self):
         # pass if not implemented
         pass
 
+    async def test_get_account_id(self):
+        # pass if not implemented
+        pass
+
     async def test_create_and_cancel_limit_orders(self):
         await super().test_create_and_cancel_limit_orders()
 

additional_tests/exchanges_tests/test_binance.py

@@ -38,6 +38,9 @@ async def test_get_portfolio(self):
     async def test_get_portfolio_with_market_filter(self):
         await super().test_get_portfolio_with_market_filter()
 
+    async def test_get_account_id(self):
+        await super().test_get_account_id()
+
     async def test_create_and_cancel_limit_orders(self):
         await super().test_create_and_cancel_limit_orders()
 

additional_tests/exchanges_tests/test_binance_futures.py

@@ -34,6 +34,7 @@ class TestBinanceFuturesAuthenticatedExchange(
     INVERSE_SYMBOL = f"{ORDER_CURRENCY}/USD:{ORDER_CURRENCY}"
     ORDER_SIZE = 10  # % of portfolio to include in test orders
     DUPLICATE_TRADES_RATIO = 0.1   # allow 10% duplicate in trades (due to trade id set to order id)
+    IS_ACCOUNT_ID_AVAILABLE = False  # set False when get_account_id is not available and should be checked
 
     async def _set_account_types(self, account_types):
         # todo remove this and use both types when exchange-side multi portfolio is enabled
@@ -46,6 +47,9 @@ async def test_get_portfolio_with_market_filter(self):
         # pass if not implemented
         pass
 
+    async def test_get_account_id(self):
+        await super().test_get_account_id()
+
     async def test_get_empty_linear_and_inverse_positions(self):
         await super().test_get_empty_linear_and_inverse_positions()
 

additional_tests/exchanges_tests/test_bingx.py

@@ -39,6 +39,10 @@ async def test_get_portfolio(self):
     async def test_get_portfolio_with_market_filter(self):
         await super().test_get_portfolio_with_market_filter()
 
+    async def test_get_account_id(self):
+        # pass if not implemented
+        pass
+
     async def test_create_and_cancel_limit_orders(self):
         await super().test_create_and_cancel_limit_orders()
 

additional_tests/exchanges_tests/test_bitget.py

@@ -41,10 +41,16 @@ async def test_get_portfolio_with_market_filter(self):
         # pass if not implemented
         pass
 
+    async def test_get_account_id(self):
+        # pass if not implemented
+        pass
+
     async def test_create_and_cancel_limit_orders(self):
+        # KYC needed    8th jan 2024    ccxt 4.2.10
         await super().test_create_and_cancel_limit_orders()
 
     async def test_create_and_fill_market_orders(self):
+        # KYC needed    8th jan 2024    ccxt 4.2.10
         await super().test_create_and_fill_market_orders()
 
     async def test_get_my_recent_trades(self):

additional_tests/exchanges_tests/test_bybit.py

@@ -43,6 +43,10 @@ async def test_get_portfolio_with_market_filter(self):
         # pass if not implemented
         pass
 
+    async def test_get_account_id(self):
+        # pass if not implemented
+        pass
+
     async def test_create_and_cancel_limit_orders(self):
         await super().test_create_and_cancel_limit_orders()
 

additional_tests/exchanges_tests/test_bybit_futures.py

@@ -44,6 +44,10 @@ async def test_get_portfolio_with_market_filter(self):
         # pass if not implemented
         pass
 
+    async def test_get_account_id(self):
+        # pass if not implemented
+        pass
+
     async def test_get_empty_linear_and_inverse_positions(self):
         await super().test_get_empty_linear_and_inverse_positions()