Merge pull request #41 from coding-kitties/hot_fix_executor

Hot fix executor

Author: coding-kitties

LICENSE

@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             coding kitties.
-Licensed Work:        Investing Algorithm Framework
+Licensed Work:        Investing Algorithm Framework.
                       The Licensed Work is (c) 2020 coding kitties.
 Additional Use Grant: You may make use of the Licensed Work, provided that you do
                       not use the Licensed Work for an Algorithm
@@ -14,7 +14,23 @@ Additional Use Grant: You may make use of the Licensed Work, provided that you d
                       contractors) to sell and host applications created with the Licensed
                       Work.
 
-Change Date:          2023-06-20
+                      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+                      CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+                      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+                      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+                      PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+                      THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+                      ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+                      OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+                      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+                      LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+                      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+                      IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+                      NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+                      USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+                      POSSIBILITY OF SUCH DAMAGE.
+
+Change Date:          2023-07-16
 
 Change License:       Apache License, Version 2.0
 

investing_algorithm_framework/__init__.py

@@ -3,4 +3,3 @@
 VERSION = (0, 1, 1, 'alpha', 0)
 
 __all__ = ['get_version']
-

investing_algorithm_framework/configuration/setup/default_template_creators.py

@@ -91,6 +91,8 @@ def create(self) -> None:
 
                 # Format placeholders in file if needed
                 if filename in [
+                    'Dockerfile-template',
+                    'requirements.txt-template',
                     'manage.py-template',
                     'settings.py-template',
                     'context.py-template',

investing_algorithm_framework/configuration/setup/template_creator.py

@@ -10,6 +10,7 @@ class TemplateCreator(Template, ABC):
     rewrite_template_suffixes = (
         # Allow shipping invalid .py files without byte-compilation.
         ('.py-template', '.py'),
+        ('-template', '')
     )
 
     def __init__(self,  bot_project_directory: str, bot_name: str) -> None:

investing_algorithm_framework/extensions/database_resolver.py

@@ -108,7 +108,7 @@ def __get__(self, instance, owner):
             return None
 
 
-class Model(object):
+class Model:
     """
     Standard SQL alchemy model
 
@@ -154,7 +154,7 @@ def _flush(self):
             self.session.rollback()
             raise
 
-    def _repr(self, **fields: Any) -> str:
+    def repr(self, **fields: Any) -> str:
         """
         Helper for __repr__
         """
@@ -163,6 +163,7 @@ def _repr(self, **fields: Any) -> str:
         at_least_one_attached_attribute = False
 
         for key, field in fields.items():
+
             try:
                 field_strings.append(f'{key}={field!r}')
             except DetachedInstanceError:
@@ -232,7 +233,7 @@ def session(self) -> Session:
         return self.Session()
 
     @property
-    def model(self) -> Model:
+    def model(self):
         return self._model
 
     def initialize_tables(self):
@@ -352,7 +353,7 @@ def configure(self, database_config: dict = None) -> None:
 
             if self.context is None:
                 raise DatabaseOperationalException(
-                    "Context is not configured with DatabaseResolver instance"
+                    "There is no database configuration"
                 )
 
             if not self.context.config.configured:
@@ -364,12 +365,12 @@ def configure(self, database_config: dict = None) -> None:
                 configuration = self.context.config[DATABASE_CONFIG]
             except Exception:
                 raise DatabaseOperationalException(
-                    "Database configuration has no database configuration"
+                    "Context config has no database configuration"
                 )
 
         if configuration is None:
             raise DatabaseOperationalException(
-                "Database configuration has no database configuration"
+                "There is no database configuration"
             )
         try:
             database_type = configuration[DATABASE_TYPE]

investing_algorithm_framework/templates/projects/algorithm_project_directory/Dockerfile-template

@@ -0,0 +1,8 @@
+FROM python:3.7-alpine
+
+WORKDIR /app
+COPY . /app
+
+RUN pip install -r requirements.txt
+
+CMD ["python", "manage.py", "run_algorithm"]

investing_algorithm_framework/templates/projects/algorithm_project_directory/algorithm_project_template/configuration/settings.py-template

@@ -8,7 +8,7 @@ CONTEXT_CONFIGURATION = '{{ project_name }}.configuration.context'
 # Change this when not in development, feature or hot-fix branch
 DEBUG = int(os.environ.get('DEBUG', True))
 
-BASE_DIR = str(Path(__file__).parent.parent)
+BASE_DIR = str(Path(__file__).parent.parent.parent)
 
 LOG_FILE_NAME = 'log'
 

investing_algorithm_framework/templates/projects/algorithm_project_directory/requirements.txt-template

@@ -0,0 +1 @@
+investing-algorithm-framework

investing_algorithm_framework/templates/states/ordering_state.py

@@ -1,5 +1,4 @@
 from typing import List
-import logging
 
 from investing_algorithm_framework.core.executors import Executor
 from investing_algorithm_framework.core.state import State

tests/extensions/test_database_resolver.py

@@ -87,6 +87,9 @@ class TestModel(db.model):
         id = Column(Integer, primary_key=True)
         name = Column(String)
 
+        def __repr__(self):
+            return self.repr(id=self.id, name=self.name)
+
     def test_creating(self):
         self.db.initialize_tables()
         assert len(self.TestModel.query.all()) == 0

tests/management/test_create_standard_algo.py

@@ -24,6 +24,12 @@ def test(self):
             # Check if manage py is present
             assert os.path.isfile(os.path.join(tempdir, 'manage.py'))
 
+            # Check if docker file is present
+            assert os.path.isfile(os.path.join(tempdir, 'Dockerfile'))
+
+            # Check if requirements.txt is present
+            assert os.path.isfile(os.path.join(tempdir, 'requirements.txt'))
+
             # Check if all directories are present
             assert os.path.isdir(
                 os.path.join(tempdir, self.project_name, 'data_providers')