Update imports

Author: MDUYN

investing_algorithm_framework/__main__.py

@@ -1,6 +1,6 @@
 """
 Invokes investing_algorithm_framework-admin when the investing_algorithm_framework framework module is run as a script.
-Example: python -m investing_algorithm_framework createbot SampleBot
+Example: python -m investing_algorithm_framework createalgorithm SampleAlgorithm
 """
 
 from investing_algorithm_framework.core.management import execute_from_command_line

investing_algorithm_framework/core/configuration/config_constants.py

@@ -3,12 +3,12 @@
 FRAMEWORK_CORE_MODULE_NAME = 'investing_algorithm_framework.core'
 
 # Setting related constants
-SETTINGS_BOT_PROJECT_NAME = 'BOT_PROJECT_NAME'
-SETTINGS_MODULE_PATH_ENV_NAME = 'INVESTING_BOT_FRAMEWORK_SETTINGS_MODULE'
+SETTINGS_ALGORITHM_PROJECT_NAME = 'ALGORITHM_PROJECT_NAME'
+SETTINGS_MODULE_PATH_ENV_NAME = 'INVESTING_ALGORITHM_FRAMEWORK_SETTINGS_MODULE'
 SETTINGS_DATA_PROVIDER_REGISTERED_APPS = 'INSTALLED_DATA_PROVIDER_APPS'
 SETTINGS_STRATEGY_REGISTERED_APPS = 'INSTALLED_STRATEGY_APPS'
 SETTINGS_MAX_WORKERS = 'DEFAULT_MAX_WORKERS'
-SETTINGS_BOT_CONTEXT_CONFIGURATION = 'BOT_CONTEXT_CONFIGURATION'
+SETTINGS_CONTEXT_CONFIGURATION = 'CONTEXT_CONFIGURATION'
 SETTINGS_LOGGING_CONFIG = 'LOGGING'
 
 # Operational constants

investing_algorithm_framework/core/configuration/template.py

@@ -10,8 +10,9 @@ class Template:
 
     def __init__(self, bot_project_directory: str, bot_name: str) -> None:
         """
-        investing_algorithm_framework project directory is the root directory of the given investing_algorithm_framework. The bot_name will be the same as the root project
-        directory. For simplicity it is explicitly passed as a parameter
+        investing_algorithm_framework project directory is the root directory of the given
+        investing_algorithm_framework. The algorithm_name will be the same as the root project directory. For
+        simplicity it is explicitly passed as a parameter
         """
 
         if bot_project_directory is None:

investing_algorithm_framework/core/data_providers/mixins/__init__.py

@@ -154,8 +154,6 @@ def initialize(self):
     def make_declarative_base(model_class):
         """
         Creates the declarative base that all models will inherit from.
-
-        :param model_class: base model class to pass to :func:`~sqlalchemy.ext.declarative.declarative_base`.
         """
 
         model = declarative_base(cls=model_class)

investing_algorithm_framework/core/data_providers/mixins/rest_api_mixin.py

@@ -4,7 +4,7 @@
 from wrapt import synchronized
 
 from investing_algorithm_framework.core.events import Observer
-from investing_algorithm_framework.core.context.bot_context import BotContext
+from investing_algorithm_framework.core.context.context import Context
 from investing_algorithm_framework.core.exceptions import OperationalException
 from investing_algorithm_framework.core.states import BotState
 from investing_algorithm_framework.core.executors import ExecutionScheduler
@@ -83,7 +83,7 @@ class DataProvidingState(BotState, Observer):
 
     data_provider_scheduler: DataProviderScheduler = None
 
-    def __init__(self, context: BotContext) -> None:
+    def __init__(self, context: Context) -> None:
         super(DataProvidingState, self).__init__(context)
         self._updated = False
         self.data_provider_executor = None

investing_algorithm_framework/core/resolvers/database_resolver.py

@@ -23,7 +23,7 @@ def test(self) -> None:
         assert executor.processing
         assert active_count() == 3
 
-        sleep(2)
+        sleep(3)
 
         # # After finishing only 1 thread must be active
         assert active_count(), 1
@@ -58,13 +58,7 @@ def test(self) -> None:
         assert executor.processing
         assert active_count() == 3
 
-        sleep(2)
-
-        # After finishing only two threads must be active (main + last worker, because max workers is 2)
-        assert active_count() == 2
-        assert executor.processing
-
-        sleep(1)
+        sleep(4)
 
         # After finishing only 1 thread must be active
         assert active_count(), 1

investing_algorithm_framework/core/states/templates/data_providing_state.py

@@ -0,0 +1,45 @@
+import os
+from tempfile import TemporaryDirectory
+from tests.resources.utils import random_string
+from investing_algorithm_framework.core.management.commands.create_algorithm import CreateAlgorithmCommand
+
+
+class TestCreateAlgorithm:
+    project_name = None
+    project_dir = None
+
+    def setup_method(self):
+        self.project_name = random_string(10)
+
+    def test(self):
+
+        with TemporaryDirectory() as tempdir:
+
+            command = CreateAlgorithmCommand()
+            command.handle(name=self.project_name, directory=tempdir)
+
+            # Check if manage py is present
+            assert os.path.isfile(os.path.join(tempdir, 'manage.py'))
+
+            # Check if all directories are present
+            assert os.path.isdir(os.path.join(tempdir, self.project_name, 'data_providers'))
+            assert os.path.isdir(os.path.join(tempdir, self.project_name, 'order_executors'))
+            assert os.path.isdir(os.path.join(tempdir, self.project_name, 'strategies'))
+            assert os.path.isdir(os.path.join(tempdir, self.project_name, 'configuration'))
+
+            # Check if all configuration files are present
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'configuration', '__init__.py'))
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'configuration', 'context.py'))
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'configuration', 'settings.py'))
+
+            # Check if all data provider files are present
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'data_providers', '__init__.py'))
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'data_providers', 'data_providers.py'))
+
+            # Check if all strategies files are present
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'strategies', '__init__.py'))
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'strategies', 'strategies.py'))
+
+            # Check if all order_executors files are present
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'order_executors', '__init__.py'))
+            assert os.path.isfile(os.path.join(tempdir, self.project_name, 'order_executors', 'order_executors.py'))