master merge

CHANGELOG.md

@@ -6,6 +6,17 @@ 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)*
 
+## [0.4.6] - 2022-08-23
+### Added
+- [Trading] Futures trading
+- [Exchange] Bitget
+- [Trading] Copy trading
+- [Beta] Beta environment
+### Updated
+- [Community] Migrate to updated community website
+### Fixed
+- [Websockets] Multiple issues related to candles refresh
+
 ## [0.4.5] - 2022-06-12
 ### Fixed
 - [Trading modes] Stop loss are not created after instantly filled limit orders

README.md

@@ -1,4 +1,4 @@
-# OctoBot [0.4.5](https://octobot.click/gh-changelog)
+# OctoBot [0.4.6](https://octobot.click/gh-changelog)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg)](https://octobot.click/gh-pypi)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e07fb190156d4efb8e7d07aaa5eff2e1)](https://app.codacy.com/gh/Drakkar-Software/OctoBot?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot&utm_campaign=Badge_Grade_Dashboard)[![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot)
 [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg)](https://octobot.click/gh-dockerhub)
@@ -101,10 +101,6 @@ In short :
 
 - Get 60-day free Digital Ocean hosting by registering with [OctoBot referral link](https://m.do.co/c/40c9737100b1).
 
-[![Develop on Okteto](https://okteto.com/develop-okteto.svg)](https://octobot.click/gh-okteto-deploy)
-
-- Free 24-hour demo repeatable indefinitely on Okteto simply using your Github account
-
 ## Exchanges
 [![Binance](../assets/binance-logo.png)](https://octobot.click/gh-binance)
 [![Binance](../assets/ftx-logo.png)](https://octobot.click/gh-ftx)
@@ -145,8 +141,4 @@ See [LICENSE](https://octobot.click/gh-license) to see the full text.
 <td>Special thanks to <a href="https://m.do.co/c/40c9737100b1" target="_blank">DigitalOcean</a> for hosting OctoBot's open source tentacles and community websites.</td>
 <td><a href="https://m.do.co/c/40c9737100b1" target="_blank"><p align="center"><img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PNG/DO_Logo_Horizontal_Blue.png?utm_medium=opensource&utm_source=OctoBot"></p></a></td>
 </tr>
-<tr>
-<td>Thanks to <a href="https://okteto.com/" target="_blank">Okteto</a> for allowing OctoBot developers to test their changes online with a simple button.</td>
-<td><a href="https://okteto.com/" target="_blank"><p align="center"><img src="https://github.com/Drakkar-Software/OctoBot/blob/assets/okteto.png?raw=true"></p></a></td>
-</tr>
 </table>

dev_requirements.txt

@@ -1,6 +1,6 @@
-pytest>=6.1.1
+pytest>=7.1
+pytest-asyncio>=0.19
 pytest-cov
-pytest-asyncio==0.18.3
 pytest-timeout
 
 mock>=4.0.1

octobot/__init__.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/api/__init__.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/api/backtesting.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/api/strategy_optimizer.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/api/updater.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/backtesting/__init__.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/backtesting/abstract_backtesting_test.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/backtesting/independent_backtesting.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -370,7 +370,9 @@ def _find_reference_market(self):
                         self.logger.error(f"Mixed inverse and linear contracts backtesting are not supported yet")
                     self.octobot_backtesting.futures_contract_type = trading_enums.FutureContractType.LINEAR_PERPETUAL
                 # in inverse contracts, use BTC for BTC/USD trading as reference market
-                return symbol.settlement_asset
+                if symbol.settlement_asset:
+                    # only use settlement asset if available
+                    return symbol.settlement_asset
             for symbol in symbols:
                 quote = symbol.quote
                 if ref_market_candidate is None:

octobot/backtesting/octobot_backtesting.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/channels/__init__.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/channels/octobot_channel.py

@@ -1,6 +1,6 @@
 # pylint: disable=E0203
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License

octobot/cli.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -203,6 +203,9 @@ def start_octobot(args):
         # add args to config
         update_config_with_args(args, config, logger)
 
+        # switch environments if necessary
+        octobot_community.IdentifiersProvider.use_environment_from_config(config)
+
         # show terms
         _log_terms_if_unaccepted(config, logger)
 

octobot/commands.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -118,16 +118,12 @@ async def install_all_tentacles(tentacles_url=None):
     if tentacles_url is None:
         tentacles_url = configuration_manager.get_default_tentacles_url()
     async with aiohttp.ClientSession() as aiohttp_session:
-        await tentacles_manager_api.install_all_tentacles(tentacles_url,
-                                                          aiohttp_session=aiohttp_session,
-                                                          bot_install_dir=os.getcwd())
-        # compiled_tentacles_url = tentacles_manager_api.get_compiled_tentacles_url(
-        #     constants.DEFAULT_COMPILED_TENTACLES_URL,
-        #     constants.TENTACLES_REQUIRED_VERSION
-        # )
-        # await tentacles_manager_api.install_all_tentacles(compiled_tentacles_url,
-        #                                                   aiohttp_session=aiohttp_session,
-        #                                                   bot_install_dir=constants.OCTOBOT_FOLDER)
+        for url in (tentacles_url, constants.ADDITIONAL_TENTACLES_PACKAGE_URL):
+            if url is None:
+                continue
+            await tentacles_manager_api.install_all_tentacles(url,
+                                                              aiohttp_session=aiohttp_session,
+                                                              bot_install_dir=os.getcwd())
 
 
 def _signal_handler(_, __):

octobot/community/__init__.py

@@ -1,5 +1,5 @@
 #  This file is part of OctoBot (https://github.com/Drakkar-Software/OctoBot)
-#  Copyright (c) 2021 Drakkar-Software, All rights reserved.
+#  Copyright (c) 2022 Drakkar-Software, All rights reserved.
 #
 #  OctoBot is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -14,6 +14,19 @@
 #  You should have received a copy of the GNU General Public
 #  License along with OctoBot. If not, see <https://www.gnu.org/licenses/>.
 
+from octobot.community import errors
+from octobot.community.errors import (
+    RequestError,
+    StatusCodeRequestError,
+)
+from octobot.community import identifiers_provider
+from octobot.community.identifiers_provider import (
+    IdentifiersProvider,
+)
+from octobot.community import community_user_account
+from octobot.community.community_user_account import (
+    CommunityUserAccount,
+)
 from octobot.community import community_fields
 from octobot.community.community_fields import (
     CommunityFields,
@@ -25,7 +38,8 @@
 from octobot.community import community_tentacles_package
 from octobot.community import community_supports
 from octobot.community import community_donation
-from octobot.community import community_feed
+from octobot.community import graphql_requests
+from octobot.community import feeds
 from octobot.community import errors_upload
 
 from octobot.community.community_analysis import (
@@ -48,8 +62,16 @@
 from octobot.community.community_donation import (
     CommunityDonation
 )
-from octobot.community.community_feed import (
-    CommunityFeed
+from octobot.community.graphql_requests import (
+    create_new_device_query,
+    select_device,
+    select_devices,
+)
+from octobot.community.feeds import (
+    AbstractFeed,
+    CommunityWSFeed,
+    CommunityMQTTFeed,
+    community_feed_factory,
 )
 from octobot.community.errors_upload import (
     register_error_uploader,
@@ -58,6 +80,10 @@
 )
 
 __all__ = [
+    "RequestError",
+    "StatusCodeRequestError",
+    "IdentifiersProvider",
+    "CommunityUserAccount",
     "CommunityFields",
     "get_community_metrics",
     "get_current_octobots_stats",
@@ -70,4 +96,11 @@
     "register_error_uploader",
     "Error",
     "ErrorsUploader",
+    "create_new_device_query",
+    "select_device",
+    "select_devices",
+    "AbstractFeed",
+    "CommunityWSFeed",
+    "CommunityMQTTFeed",
+    "community_feed_factory",
 ]